summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-05-24 22:48:46 +0200
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-05-25 20:37:11 +0200
commite45358d0b4d31acb4b345d1f5037e3a9f4458642 (patch)
tree729ef322be57bbba05aa432109b7fe38503fd4ce
parent8557f3b2e279bda3f1c58b82c6aa37f9206aeb12 (diff)
downloadMana-e45358d0b4d31acb4b345d1f5037e3a9f4458642.tar.gz
Mana-e45358d0b4d31acb4b345d1f5037e3a9f4458642.tar.bz2
Mana-e45358d0b4d31acb4b345d1f5037e3a9f4458642.tar.xz
Mana-e45358d0b4d31acb4b345d1f5037e3a9f4458642.zip
Renamed connection.{cpp,h} to connectiondialog.{cpp,h}
Consistent with the class name and avoids confusing it with the connection.{cpp,h} in net/tmwserv.
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Makefile.am4
-rw-r--r--src/gui/connectiondialog.cpp (renamed from src/gui/connection.cpp)2
-rw-r--r--src/gui/connectiondialog.h (renamed from src/gui/connection.h)0
-rw-r--r--src/main.cpp2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 82e1bdc3..91fe8e06 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -466,8 +466,8 @@ SET(SRCS_TMW
gui/buddywindow.h
gui/changeemaildialog.cpp
gui/changeemaildialog.h
- gui/connection.cpp
- gui/connection.h
+ gui/connectiondialog.cpp
+ gui/connectiondialog.h
gui/guildlistbox.cpp
gui/guildlistbox.h
gui/guildwindow.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 7ed6da63..23de64bc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -370,8 +370,8 @@ tmw_SOURCES += \
gui/buddywindow.h \
gui/changeemaildialog.cpp \
gui/changeemaildialog.h \
- gui/connection.cpp \
- gui/connection.h \
+ gui/connectiondialog.cpp \
+ gui/connectiondialog.h \
gui/guildlistbox.cpp \
gui/guildlistbox.h \
gui/guildwindow.cpp \
diff --git a/src/gui/connection.cpp b/src/gui/connectiondialog.cpp
index 4863edcd..1c3b7ff5 100644
--- a/src/gui/connection.cpp
+++ b/src/gui/connectiondialog.cpp
@@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "connection.h"
+#include "connectiondialog.h"
#include "gui/widgets/button.h"
#include "gui/widgets/label.h"
diff --git a/src/gui/connection.h b/src/gui/connectiondialog.h
index d6059c3f..d6059c3f 100644
--- a/src/gui/connection.h
+++ b/src/gui/connectiondialog.h
diff --git a/src/main.cpp b/src/main.cpp
index 2bf9820e..32bf2e2f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -53,7 +53,7 @@
#include "gui/serverselectdialog.h"
#include "gui/setup.h"
#ifdef TMWSERV_SUPPORT
-#include "gui/connection.h"
+#include "gui/connectiondialog.h"
#include "gui/quitdialog.h"
#include "gui/serverdialog.h"
#endif