Some more filename changes. Should be it for now.

diff --git a/Quassel.kdevelop.filelist b/Quassel.kdevelop.filelist
index 50baa35..eeefbc6 100644 (file)
--- 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 169d28a..0d4eacc 100644 (file)
--- 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 <QSettings>

diff --git a/core/coreproxy.cpp b/core/coreproxy.cpp
index dd14c81..9ea3e68 100644 (file)
--- a/core/coreproxy.cpp
+++ b/core/coreproxy.cpp
@@ -21,7 +21,7 @@
 #include <QDebug>
 
 #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 8a8c328..d4d5ef1 100644 (file)
--- 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 932c538..cecde30 100644 (file)
--- 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 477ac04..9cf41a4 100644 (file)
--- a/gui/coreconnectdlg.cpp
+++ b/gui/coreconnectdlg.cpp
@@ -21,7 +21,7 @@
 #include <QtGui>
 #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 ec6d8d4..db8de04 100644 (file)
--- a/gui/mainwin.cpp
+++ b/gui/mainwin.cpp
@@ -20,7 +20,7 @@
 
 #include <QtGui>
 
-#include "quassel.h"
+#include "global.h"
 
 #include "mainwin.h"
 #include "channelwidget.h"

diff --git a/gui/serverlist.cpp b/gui/serverlist.cpp
index 06e73a6..3053bfb 100644 (file)
--- 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 17ce279..4f38f8c 100644 (file)
--- 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 cb35cc2..7a47771 100644 (file)
--- 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 cad728c..25bb06b 100644 (file)
--- 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 <iostream>

diff --git a/main/main_core.cpp b/main/main_core.cpp
index 1997034..740482b 100644 (file)
--- a/main/main_core.cpp
+++ b/main/main_core.cpp
@@ -24,7 +24,7 @@
 #include <QtCore>
 #include <QtDebug>
 
-#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 bf6ed14..0355811 100644 (file)
--- a/main/main_gui.cpp
+++ b/main/main_gui.cpp
@@ -22,7 +22,7 @@
 
 #include <QApplication>
 
-#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 0a37bcb..6bd0f33 100644 (file)
--- a/main/main_mono.cpp
+++ b/main/main_mono.cpp
@@ -23,7 +23,7 @@
 #include <QApplication>
 
 #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 f97e1ae..e008170 100644 (file)
--- 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 5e61958..28b702d 100644 (file)
--- a/network/server.h
+++ b/network/server.h
@@ -25,7 +25,7 @@
 #include <QTimer>
 #include <QtNetwork>
 
-#include "quassel.h"
+#include "global.h"
 
 #define DEFAULT_PORT 6667