and files from the former gui/ dir have been split up between the new qtgui/ and client/.
Most, if not all files should now be at their final location, while the real work (cleaning up
the code from the first phase of GUI reorganization, as well as doing the actual separation)
begins now.
# KDevelop Custom Project File List
-core/core.cpp
+client
+client/buffer.cpp
+client/buffer.h
+client/client.cpp
+client/client.h
+client/clientproxy.cpp
+client/clientproxy.h
+CMakeLists.txt
+common
+common/CMakeLists.txt
+common/global.cpp
+common/global.h
+common/logger.cpp
+common/logger.h
+common/main_core.cpp
+common/main_gui.cpp
+common/main_mono.cpp
+common/message.cpp
+common/message.h
+common/proxy_common.h
+common/settings.cpp
+common/settings.h
+common/util.cpp
+common/util.h
+core
+core/backlog.cpp
+core/backlog.h
core/CMakeLists.txt
+core/core.cpp
core/core.h
-gui/CMakeLists.txt
-gui/mainwin.cpp
-gui/mainwin.h
-gui/serverlist.cpp
-gui/serverlist.h
-images/iconmap.xml
-images/icons.qrc
-main/main_core.cpp
-main/main_mono.cpp
-CMakeLists.txt
-COPYING
-Doxyfile
-Makefile
-gui/guiproxy.h
-gui/guiproxy.cpp
-main/main_gui.cpp
core/coreproxy.cpp
core/coreproxy.h
-main/util.cpp
-main/util.h
-gui/coreconnectdlg.cpp
-gui/coreconnectdlg.h
-main/proxy_common.h
-main/CMakeLists.txt
-images/qirc-icon.png
-main/global.cpp
-main/global.h
-gui/identities.cpp
-gui/identities.h
-gui/channelwidgetinput.h
-gui/channelwidgetinput.cpp
-plugins/plugin.h
-gui/ui/channelwidget.ui
-gui/ui/coreconnectdlg.ui
-gui/ui/identitiesdlg.ui
-gui/ui/identitieseditdlg.ui
-gui/ui/ircwidget.ui
-gui/ui/mainwin.ui
-gui/ui/networkeditdlg.ui
-gui/ui/nickeditdlg.ui
-gui/ui/servereditdlg.ui
-gui/ui/serverlistdlg.ui
-gui/ui/settingsdlg.ui
-gui/ui/bufferview.ui
-gui/buffer.cpp
-gui/buffer.h
-main/message.cpp
-main/message.h
-gui/ui/bufferwidget.ui
core/server.cpp
core/server.h
-gui/chatwidget.cpp
-gui/chatwidget.h
-gui/style.cpp
-gui/style.h
-main/logger.cpp
-main/logger.h
-templates/cpp
-templates/h
-gui/bufferwidget.h
-gui/bufferwidget.cpp
-main/settings.cpp
-main/settings.h
-gui/settingsdlg.h
-gui/settingsdlg.cpp
-gui/settingspages.cpp
-gui/settingspages.h
-gui/bufferview.cpp
-gui/bufferview.h
-core/backlog.cpp
-core/backlog.h
-ChangeLog
-core/storage.cpp
-core/storage.h
core/sqlitestorage.cpp
-dev-notes
-dev-notes/builtin_cmds.obsolete.cpp
-gui
-gui/tabcompleter.cpp
-gui/tabcompleter.h
-core
core/sqlitestorage.h
+core/storage.cpp
+core/storage.h
+plugins
+plugins/plugin.h
+qtgui
+qtgui/bufferview.cpp
+qtgui/bufferview.h
+qtgui/bufferviewwidget.cpp
+qtgui/bufferviewwidget.h
+qtgui/bufferwidget.cpp
+qtgui/bufferwidget.h
+qtgui/channelwidgetinput.cpp
+qtgui/channelwidgetinput.h
+qtgui/chatwidget.cpp
+qtgui/chatwidget.h
+qtgui/CMakeLists.txt
+qtgui/coreconnectdlg.cpp
+qtgui/coreconnectdlg.h
+qtgui/identities.cpp
+qtgui/identities.h
+qtgui/mainwin.cpp
+qtgui/mainwin.h
+qtgui/serverlist.cpp
+qtgui/serverlist.h
+qtgui/settingsdlg.cpp
+qtgui/settingsdlg.h
+qtgui/settingspages.cpp
+qtgui/settingspages.h
+qtgui/style.cpp
+qtgui/style.h
+qtgui/tabcompleter.cpp
+qtgui/tabcompleter.h
+qtgui/ui
+qtgui/ui/aboutdlg.ui
+qtgui/ui/buffermgmntsettingspage.ui
+qtgui/ui/bufferviewwidget.ui
+qtgui/ui/bufferwidget.ui
+qtgui/ui/channelwidget.ui
+qtgui/ui/connectionsettingspage.ui
+qtgui/ui/coreconnectdlg.ui
+qtgui/ui/coresettingspage.ui
+qtgui/ui/identitiesdlg.ui
+qtgui/ui/identitieseditdlg.ui
+qtgui/ui/ircwidget.ui
+qtgui/ui/mainwin.ui
+qtgui/ui/networkeditdlg.ui
+qtgui/ui/nickeditdlg.ui
+qtgui/ui/servereditdlg.ui
+qtgui/ui/serverlistdlg.ui
+qtgui/ui/settingsdlg.ui
SET(CMAKE_BUILD_TYPE Debug)
# Define files
-SET(quassel_mono_SRCS main/main_mono.cpp)
-SET(quassel_core_SRCS main/main_core.cpp)
-SET(quassel_gui_SRCS main/main_gui.cpp ${common_SRCS})
+SET(quassel_mono_SRCS common/main_mono.cpp)
+SET(quassel_core_SRCS common/main_core.cpp)
+SET(quassel_gui_SRCS common/main_gui.cpp ${common_SRCS})
SET(quassel_RCCS images/icons.qrc)
-SET(quassel_DIRS main gui core)
+SET(quassel_DIRS common qtgui core)
# Build correct absolute paths for subdirs to include
SET(SDIRS "")
FOREACH(dir ${quassel_DIRS})
SET(SDIRS ${SDIRS} "${CMAKE_CURRENT_SOURCE_DIR}/${dir}")
ENDFOREACH(dir)
-INCLUDE_DIRECTORIES(${SDIRS} plugins)
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+INCLUDE_DIRECTORIES(${SDIRS} client plugins)
+#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
# We need Qt4 support.
SET(QT_MIN_VERSION "4.3.0") # 4.3 is required for SSL, crypto and some other stuff
# Define subdirs. CMake complains if a directory is added twice, so make sure this
# does not happen in any combination of the requested targets.
-ADD_SUBDIRECTORY(main)
+ADD_SUBDIRECTORY(common)
IF(BUILD_CORE)
ADD_SUBDIRECTORY(core)
ENDIF(BUILD_CORE)
IF(BUILD_CORE)
ADD_DEFINITIONS(-DBUILD_CORE)
ADD_EXECUTABLE(quasselcore ${quassel_core_SRCS} ${_RCCS})
- TARGET_LINK_LIBRARIES(quasselcore core main ${QT_LIBRARIES})
+ TARGET_LINK_LIBRARIES(quasselcore core common ${QT_LIBRARIES})
SET(TARGET_LIST ${TARGET_LIST} quasselcore)
ENDIF(BUILD_CORE)
SET(QT_INCLUDE_DIR "")
SET(QT_LIBRARIES "")
INCLUDE(${QT_USE_FILE})
- ADD_SUBDIRECTORY(gui)
+ ADD_SUBDIRECTORY(qtgui)
IF(BUILD_MONO)
ADD_DEFINITIONS(-DBUILD_MONO)
ADD_EXECUTABLE(quassel ${quassel_mono_SRCS} ${_RCCS})
- TARGET_LINK_LIBRARIES(quassel gui core main ${QT_LIBRARIES})
+ TARGET_LINK_LIBRARIES(quassel qtgui core common ${QT_LIBRARIES})
SET(TARGET_LIST ${TARGET_LIST} quassel)
ENDIF(BUILD_MONO)
IF(BUILD_GUI)
ADD_DEFINITIONS(-DBUILD_GUI)
ADD_EXECUTABLE(quasselgui ${quassel_gui_SRCS} ${_RCCS})
- TARGET_LINK_LIBRARIES(quasselgui gui main ${QT_LIBRARIES})
+ TARGET_LINK_LIBRARIES(quasselgui qtgui common ${QT_LIBRARIES})
SET(TARGET_LIST ${TARGET_LIST} quasselgui)
ENDIF(BUILD_GUI)
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#include "gui.h"
-#include "guiproxy.h"
+#include "client.h"
+#include "clientproxy.h"
#include "mainwin.h"
#include "buffer.h"
-//#include "bufferview.h"
#include "bufferviewwidget.h"
#include "util.h"
#include "global.h"
#include "buffer.h"
#include "message.h"
-#include "guiproxy.h"
-#include "bufferviewwidget.h"
+#include "clientproxy.h"
+//#include "bufferviewwidget.h"
class MainWin;
class ClientProxy;
-//class BufferTreeModel;
+class BufferTreeModel;
class Client : public QObject {
Q_OBJECT
#include <QtDebug>
-#include "guiproxy.h"
+#include "clientproxy.h"
#include "util.h"
#include "message.h"
-SET(main_SRCS global.cpp logger.cpp util.cpp message.cpp settings.cpp)
-SET(main_HDRS util.h message.h settings.h)
-SET(main_MOCS global.h logger.h)
+SET(common_SRCS global.cpp logger.cpp util.cpp message.cpp settings.cpp)
+SET(common_HDRS util.h message.h settings.h)
+SET(common_MOCS global.h logger.h)
-QT4_WRAP_CPP(_MOC ${main_MOCS})
-ADD_LIBRARY(main ${_MOC} ${main_SRCS} ${main_HDRS})
+QT4_WRAP_CPP(_MOC ${common_MOCS})
+ADD_LIBRARY(common ${_MOC} ${common_SRCS} ${common_HDRS})
#include <QApplication>
-#include "gui.h"
+#include "client.h"
#include "core.h"
#include "style.h"
#include "global.h"
-#include "guiproxy.h"
+#include "clientproxy.h"
#include "coreproxy.h"
#include "settings.h"
#include "chatwidget.h"
-#include "mainwin.h"
-
int main(int argc, char **argv) {
QApplication app(argc, argv);
QCoreApplication::setOrganizationDomain("quassel-irc.org");
-SET(gui_SRCS gui.cpp chatwidget.cpp channelwidgetinput.cpp tabcompleter.cpp mainwin.cpp serverlist.cpp buffer.cpp bufferwidget.cpp
- identities.cpp coreconnectdlg.cpp guiproxy.cpp bufferview.cpp bufferviewwidget.cpp style.cpp settingsdlg.cpp settingspages.cpp)
-SET(gui_HDRS style.h)
-SET(gui_MOCS gui.h chatwidget.h channelwidgetinput.h tabcompleter.h mainwin.h serverlist.h identities.h coreconnectdlg.h
- guiproxy.h bufferview.h buffer.h bufferwidget.h bufferviewwidget.h settingsdlg.h settingspages.h)
-SET(gui_UICS identitiesdlg.ui identitieseditdlg.ui networkeditdlg.ui mainwin.ui
+SET(qtgui_SRCS chatwidget.cpp channelwidgetinput.cpp tabcompleter.cpp mainwin.cpp serverlist.cpp bufferwidget.cpp
+ identities.cpp coreconnectdlg.cpp bufferview.cpp bufferviewwidget.cpp style.cpp settingsdlg.cpp settingspages.cpp)
+SET(qtgui_HDRS style.h)
+SET(qtgui_MOCS chatwidget.h channelwidgetinput.h tabcompleter.h mainwin.h serverlist.h identities.h coreconnectdlg.h
+ bufferview.h bufferwidget.h bufferviewwidget.h settingsdlg.h settingspages.h)
+SET(qtgui_UICS identitiesdlg.ui identitieseditdlg.ui networkeditdlg.ui mainwin.ui
nickeditdlg.ui serverlistdlg.ui servereditdlg.ui coreconnectdlg.ui ircwidget.ui
bufferviewwidget.ui bufferwidget.ui settingsdlg.ui
buffermgmntsettingspage.ui connectionsettingspage.ui)
+SET(client_SRCS ../client/client.cpp ../client/clientproxy.cpp ../client/buffer.cpp)
+SET(client_MOCS ../client/client.h ../client/clientproxy.h ../client/buffer.h)
+
# This prepends ui/ to the UIC names, so we don't have to do this ourselves.
-FOREACH(ui ${gui_UICS})
- SET(gui_UICS_UI ${gui_UICS_UI} "ui/${ui}")
+FOREACH(ui ${qtgui_UICS})
+ SET(qtgui_UICS_UI ${qtgui_UICS_UI} "ui/${ui}")
ENDFOREACH(ui)
-QT4_WRAP_UI(_UIC ${gui_UICS_UI})
-QT4_WRAP_CPP(_MOC ${gui_MOCS})
+QT4_WRAP_UI(_UIC ${qtgui_UICS_UI})
+QT4_WRAP_CPP(_MOC ${qtgui_MOCS} ${client_MOCS})
# We need to work around a dependency bug with out-of-source builds...
# Seems to be fixed!
#SET_SOURCE_FILES_PROPERTIES(${gui_SRCS} PROPERTIES OBJECT_DEPENDS "${_UIC}")
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} client)
-ADD_LIBRARY(gui ${gui_HDRS} ${gui_SRCS} ${_MOC} ${_UIC})
+ADD_LIBRARY(qtgui ${qtgui_HDRS} ${qtgui_SRCS} ${client_SRCS} ${_MOC} ${_UIC})
#include <QtGui>
#include <QtCore>
-#include "guiproxy.h"
+#include "clientproxy.h"
#include "buffer.h"
-#include "gui/ui_bufferviewwidget.h"
+#include "ui_bufferviewwidget.h"
#include "bufferview.h"
/*****************************************
#ifndef _BUFFERWIDGET_H_
#define _BUFFERWIDGET_H_
-#include "gui/ui_bufferwidget.h"
+#include "ui_bufferwidget.h"
#include "global.h"
#include "message.h"
#include <QtGui>
#include "coreconnectdlg.h"
-#include "guiproxy.h"
+#include "clientproxy.h"
#include "global.h"
-#include "gui.h"
+#include "client.h"
CoreConnectDlg::CoreConnectDlg(QWidget *parent) : QDialog(parent) {
ui.setupUi(this);
#ifndef _CORECONNECTDLG_H
#define _CORECONNECTDLG_H
-#include "coreconnectdlg.h"
-#include "gui/ui_coreconnectdlg.h"
+#include "ui_coreconnectdlg.h"
class CoreConnectDlg: public QDialog {
Q_OBJECT
#include <QtCore>
#include <QSqlDatabase>
-#include "gui.h"
+#include "client.h"
#include "util.h"
#include "global.h"
#include "message.h"
-#include "guiproxy.h"
+#include "clientproxy.h"
#include "mainwin.h"
#include "buffer.h"
#define _MAINWIN_H_
#include <QtGui>
-#include "gui/ui_mainwin.h"
+#include "ui_mainwin.h"
#include "global.h"
#include "message.h"
#include "serverlist.h"
#include "identities.h"
-#include "guiproxy.h"
+#include "clientproxy.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
projects / quassel.git / commitdiff
