summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manaplus.cbp4
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Makefile.am4
-rw-r--r--src/gui/botcheckerwindow.cpp2
-rw-r--r--src/gui/setup_relations.cpp2
-rw-r--r--src/gui/textcommandeditor.cpp2
-rw-r--r--src/gui/widgets/guitable.cpp (renamed from src/gui/widgets/table.cpp)2
-rw-r--r--src/gui/widgets/guitable.h (renamed from src/gui/widgets/table.h)0
8 files changed, 10 insertions, 10 deletions
diff --git a/manaplus.cbp b/manaplus.cbp
index 0083d9c8b..f47e5c271 100644
--- a/manaplus.cbp
+++ b/manaplus.cbp
@@ -365,8 +365,8 @@
<Unit filename="src\gui\widgets\tab.h" />
<Unit filename="src\gui\widgets\tabbedarea.cpp" />
<Unit filename="src\gui\widgets\tabbedarea.h" />
- <Unit filename="src\gui\widgets\table.cpp" />
- <Unit filename="src\gui\widgets\table.h" />
+ <Unit filename="src\gui\widgets\guitable.cpp" />
+ <Unit filename="src\gui\widgets\guitable.h" />
<Unit filename="src\gui\widgets\tablemodel.cpp" />
<Unit filename="src\gui\widgets\tablemodel.h" />
<Unit filename="src\gui\widgets\textbox.cpp" />
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 655d4896c..fba255c1c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -197,8 +197,8 @@ SET(SRCS
gui/widgets/tab.h
gui/widgets/tabbedarea.cpp
gui/widgets/tabbedarea.h
- gui/widgets/table.cpp
- gui/widgets/table.h
+ gui/widgets/guitable.cpp
+ gui/widgets/guitable.h
gui/widgets/tablemodel.cpp
gui/widgets/tablemodel.h
gui/widgets/textbox.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 8bacf6803..697575b97 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -200,8 +200,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/widgets/tab.h \
gui/widgets/tabbedarea.cpp \
gui/widgets/tabbedarea.h \
- gui/widgets/table.cpp \
- gui/widgets/table.h \
+ gui/widgets/guitable.cpp \
+ gui/widgets/guitable.h \
gui/widgets/tablemodel.cpp \
gui/widgets/tablemodel.h \
gui/widgets/textbox.cpp \
diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp
index aa44df2f3..2851d3d1d 100644
--- a/src/gui/botcheckerwindow.cpp
+++ b/src/gui/botcheckerwindow.cpp
@@ -36,7 +36,7 @@
#include "gui/widgets/label.h"
#include "gui/widgets/layout.h"
#include "gui/widgets/layouthelper.h"
-#include "gui/widgets/table.h"
+#include "gui/widgets/guitable.h"
#include "actorspritemanager.h"
#include "configuration.h"
diff --git a/src/gui/setup_relations.cpp b/src/gui/setup_relations.cpp
index 93887b133..489d5a818 100644
--- a/src/gui/setup_relations.cpp
+++ b/src/gui/setup_relations.cpp
@@ -36,7 +36,7 @@
#include "gui/widgets/label.h"
#include "gui/widgets/layouthelper.h"
#include "gui/widgets/scrollarea.h"
-#include "gui/widgets/table.h"
+#include "gui/widgets/guitable.h"
#include "gui/widgets/textfield.h"
#include "utils/dtor.h"
diff --git a/src/gui/textcommandeditor.cpp b/src/gui/textcommandeditor.cpp
index 1f1273600..8cf9fa398 100644
--- a/src/gui/textcommandeditor.cpp
+++ b/src/gui/textcommandeditor.cpp
@@ -38,7 +38,7 @@
#include "gui/widgets/layout.h"
#include "gui/widgets/layouthelper.h"
#include "gui/widgets/radiobutton.h"
-#include "gui/widgets/table.h"
+#include "gui/widgets/guitable.h"
#include "gui/widgets/textfield.h"
#include "configuration.h"
diff --git a/src/gui/widgets/table.cpp b/src/gui/widgets/guitable.cpp
index 04ae41ad7..e25e0bb8c 100644
--- a/src/gui/widgets/table.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "gui/widgets/table.h"
+#include "gui/widgets/guitable.h"
#include "client.h"
#include "configuration.h"
diff --git a/src/gui/widgets/table.h b/src/gui/widgets/guitable.h
index c4fab6a0d..c4fab6a0d 100644
--- a/src/gui/widgets/table.h
+++ b/src/gui/widgets/guitable.h