From ba8f57d654b07d77cc91a2b901ad3b664a31ffcf Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Fri, 20 Oct 2006 23:47:37 +0000 Subject: [PATCH] Some more filename changes. Should be it for now. --- Quassel.kdevelop.filelist | 11 ++++++----- core/core.cpp | 2 +- core/coreproxy.cpp | 2 +- gui/CMakeLists.txt | 2 +- gui/{channelwidget.ui => channelwidget-old.ui} | 0 gui/channelwidget.h | 2 +- gui/coreconnectdlg.cpp | 2 +- gui/mainwin.cpp | 2 +- gui/serverlist.cpp | 2 +- main/CMakeLists.txt | 4 ++-- main/{quassel.cpp => global.cpp} | 2 +- main/{quassel.h => global.h} | 0 main/logger.cpp | 2 +- main/main_core.cpp | 2 +- main/main_gui.cpp | 2 +- main/main_mono.cpp | 2 +- network/server.cpp | 2 +- network/server.h | 2 +- 18 files changed, 22 insertions(+), 21 deletions(-) rename gui/{channelwidget.ui => channelwidget-old.ui} (100%) rename main/{quassel.cpp => global.cpp} (99%) rename main/{quassel.h => global.h} (100%) diff --git a/Quassel.kdevelop.filelist b/Quassel.kdevelop.filelist index 50baa357..eeefbc6c 100644 --- a/Quassel.kdevelop.filelist +++ b/Quassel.kdevelop.filelist @@ -6,7 +6,6 @@ core/CMakeLists.txt core/core.h gui/channelwidget.cpp gui/channelwidget.h -gui/channelwidget.ui gui/CMakeLists.txt gui/identitiesdlg.ui gui/identitieseditdlg.ui @@ -28,10 +27,6 @@ Doxyfile Makefile gui/guiproxy.h gui/guiproxy.cpp -main/logger.cpp -main/logger.h -main/quassel.cpp -main/quassel.h main/main_gui.cpp core/coreproxy.cpp core/coreproxy.h @@ -40,3 +35,9 @@ main/util.h gui/coreconnectdlg.ui gui/coreconnectdlg.cpp gui/coreconnectdlg.h +main/proxy_common.h +main/CMakeLists.txt +images/qirc-icon.png +main/global.cpp +main/global.h +gui/channelwidget-old.ui diff --git a/core/core.cpp b/core/core.cpp index 169d28ad..0d4eaccb 100644 --- a/core/core.cpp +++ b/core/core.cpp @@ -20,7 +20,7 @@ #include "core.h" #include "server.h" -#include "quassel.h" +#include "global.h" #include "coreproxy.h" #include diff --git a/core/coreproxy.cpp b/core/coreproxy.cpp index dd14c812..9ea3e68e 100644 --- a/core/coreproxy.cpp +++ b/core/coreproxy.cpp @@ -21,7 +21,7 @@ #include #include "coreproxy.h" -#include "quassel.h" +#include "global.h" #include "util.h" CoreProxy::CoreProxy() { diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 8a8c328b..d4d5ef11 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -1,7 +1,7 @@ SET(gui_SRCS channelwidget.cpp mainwin.cpp serverlist.cpp coreconnectdlg.cpp guiproxy.cpp) SET(gui_HDRS ) SET(gui_MOCS channelwidget.h mainwin.h serverlist.h coreconnectdlg.h guiproxy.h) -SET(gui_UICS channelwidget.ui identitiesdlg.ui identitieseditdlg.ui networkeditdlg.ui nickeditdlg.ui serverlistdlg.ui coreconnectdlg.ui) +SET(gui_UICS channelwidget-old.ui identitiesdlg.ui identitieseditdlg.ui networkeditdlg.ui nickeditdlg.ui serverlistdlg.ui coreconnectdlg.ui) QT4_WRAP_UI(_UIC ${gui_UICS}) QT4_WRAP_CPP(_MOC ${gui_MOCS}) diff --git a/gui/channelwidget.ui b/gui/channelwidget-old.ui similarity index 100% rename from gui/channelwidget.ui rename to gui/channelwidget-old.ui diff --git a/gui/channelwidget.h b/gui/channelwidget.h index 932c5383..cecde30d 100644 --- a/gui/channelwidget.h +++ b/gui/channelwidget.h @@ -21,7 +21,7 @@ #ifndef _CHANNELWIDGET_H_ #define _CHANNELWIDGET_H_ -#include "ui_channelwidget.h" +#include "ui_channelwidget-old.h" class ChannelWidget : public QWidget { Q_OBJECT diff --git a/gui/coreconnectdlg.cpp b/gui/coreconnectdlg.cpp index 477ac042..9cf41a49 100644 --- a/gui/coreconnectdlg.cpp +++ b/gui/coreconnectdlg.cpp @@ -21,7 +21,7 @@ #include #include "coreconnectdlg.h" #include "guiproxy.h" -#include "quassel.h" +#include "global.h" CoreConnectDlg::CoreConnectDlg(QWidget *parent) : QDialog(parent) { ui.setupUi(this); diff --git a/gui/mainwin.cpp b/gui/mainwin.cpp index ec6d8d47..db8de04e 100644 --- a/gui/mainwin.cpp +++ b/gui/mainwin.cpp @@ -20,7 +20,7 @@ #include -#include "quassel.h" +#include "global.h" #include "mainwin.h" #include "channelwidget.h" diff --git a/gui/serverlist.cpp b/gui/serverlist.cpp index 06e73a6a..3053bfb1 100644 --- a/gui/serverlist.cpp +++ b/gui/serverlist.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "serverlist.h" -#include "quassel.h" +#include "global.h" /* NOTE: This dialog holds not only the server list, but also the identities. * This makes perfect sense given the fact that connections are initiated from diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 17ce2796..4f38f8c5 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -1,6 +1,6 @@ -SET(main_SRCS quassel.cpp logger.cpp util.cpp) +SET(main_SRCS global.cpp logger.cpp util.cpp) SET(main_HDRS util.h) -SET(main_MOCS quassel.h logger.h) +SET(main_MOCS global.h logger.h) QT4_WRAP_CPP(_MOC ${main_MOCS}) ADD_LIBRARY(main ${_MOC} ${main_SRCS} ${main_HDRS}) diff --git a/main/quassel.cpp b/main/global.cpp similarity index 99% rename from main/quassel.cpp rename to main/global.cpp index cb35cc21..7a47771b 100644 --- a/main/quassel.cpp +++ b/main/global.cpp @@ -18,7 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "quassel.h" +#include "global.h" #include "logger.h" #include "core.h" diff --git a/main/quassel.h b/main/global.h similarity index 100% rename from main/quassel.h rename to main/global.h diff --git a/main/logger.cpp b/main/logger.cpp index cad728c2..25bb06b0 100644 --- a/main/logger.cpp +++ b/main/logger.cpp @@ -18,7 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "quassel.h" +#include "global.h" #include "logger.h" #include diff --git a/main/main_core.cpp b/main/main_core.cpp index 19970342..740482b5 100644 --- a/main/main_core.cpp +++ b/main/main_core.cpp @@ -24,7 +24,7 @@ #include #include -#include "quassel.h" +#include "global.h" #include "core.h" #include "coreproxy.h" #include "util.h" diff --git a/main/main_gui.cpp b/main/main_gui.cpp index bf6ed146..03558111 100644 --- a/main/main_gui.cpp +++ b/main/main_gui.cpp @@ -22,7 +22,7 @@ #include -#include "quassel.h" +#include "global.h" #include "guiproxy.h" #include "util.h" diff --git a/main/main_mono.cpp b/main/main_mono.cpp index 0a37bcbb..6bd0f336 100644 --- a/main/main_mono.cpp +++ b/main/main_mono.cpp @@ -23,7 +23,7 @@ #include #include "core.h" -#include "quassel.h" +#include "global.h" #include "guiproxy.h" #include "coreproxy.h" diff --git a/network/server.cpp b/network/server.cpp index f97e1aed..e0081702 100644 --- a/network/server.cpp +++ b/network/server.cpp @@ -18,7 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "quassel.h" +#include "global.h" #include "server.h" #include "cmdcodes.h" diff --git a/network/server.h b/network/server.h index 5e619588..28b702d3 100644 --- a/network/server.h +++ b/network/server.h @@ -25,7 +25,7 @@ #include #include -#include "quassel.h" +#include "global.h" #define DEFAULT_PORT 6667 -- 2.20.1