From: Manuel Nickschas Date: Fri, 19 Oct 2007 12:51:06 +0000 (+0000) Subject: Renaming QtGui to QtUi, in order to not confuse build systems on non-case-sensitive X-Git-Tag: 0.1.0~127 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=7ee03b94132fcd5706e98db72de76c13cb977666;ds=sidebyside Renaming QtGui to QtUi, in order to not confuse build systems on non-case-sensitive systems. Also getting rid of CMake... Stage 1: Not done yet, not working - DO NOT CHECK OUT JUST NOW! --- diff --git a/Quassel.kdevelop.filelist b/Quassel.kdevelop.filelist index ff70bb1d..f64daea3 100644 --- a/Quassel.kdevelop.filelist +++ b/Quassel.kdevelop.filelist @@ -7,10 +7,8 @@ src/client/buffertreemodel.cpp src/client/buffertreemodel.h src/client/client.cpp src/client/client.h -src/client/CMakeLists.txt src/client/treemodel.cpp src/client/treemodel.h -src/CMakeLists.txt src/common src/common/build_core.cpp src/common/build_mono.cpp @@ -54,7 +52,6 @@ src/qtgui/chatline.cpp src/qtgui/chatline.h src/qtgui/chatwidget.cpp src/qtgui/chatwidget.h -src/qtgui/CMakeLists.txt src/qtgui/coreconnectdlg.cpp src/qtgui/coreconnectdlg.h src/qtgui/identities.cpp diff --git a/build/modules/qtgui.pro b/build/modules/qtui.pro similarity index 55% rename from build/modules/qtgui.pro rename to build/modules/qtui.pro index d311433b..02327217 100644 --- a/build/modules/qtgui.pro +++ b/build/modules/qtui.pro @@ -1,3 +1,2 @@ -MODULE = qtgui +MODULE = qtui include(module.pri) - diff --git a/build/targets/monolithic.pri b/build/targets/monolithic.pri index 5ba3269f..131a01bf 100644 --- a/build/targets/monolithic.pri +++ b/build/targets/monolithic.pri @@ -1,7 +1,7 @@ # Modules for monolithic client TARGET = quassel -MODULES = core qtgui client common contrib/qxt +MODULES = core qtui client common contrib/qxt DEFINES = BUILD_MONO QT += network sql diff --git a/build/targets/qtgui.pri b/build/targets/qtclient.pri similarity index 51% rename from build/targets/qtgui.pri rename to build/targets/qtclient.pri index 30930656..529caf03 100644 --- a/build/targets/qtgui.pri +++ b/build/targets/qtclient.pri @@ -1,7 +1,7 @@ # Modules for quasselclient TARGET = quasselclient -MODULES = qtgui client common contrib/qxt -DEFINES = BUILD_QTGUI +MODULES = qtui client common contrib/qxt +DEFINES = BUILD_QTUI QT += network diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt deleted file mode 100644 index 19de1c4a..00000000 --- a/src/CMakeLists.txt +++ /dev/null @@ -1,111 +0,0 @@ -PROJECT(Quassel) - -# 2.4.2 had a bug with out-of-source builds and UIC dependencies. -CMAKE_MINIMUM_REQUIRED(VERSION 2.4.3 FATAL_ERROR) - -# Select if Quassel should be built in client, server or monolithic mode -SET(BUILD "mono" CACHE STRING "Defines which Quassel parts are to be built. Can contain 'core', 'gui' and/or 'monolithic' (which is the default), or 'all' to build everything.") -SET(BUILD_CORE ) -SET(BUILD_QTGUI ) -SET(BUILD_MONO ) -IF(BUILD MATCHES "core" OR BUILD MATCHES "all") - SET(BUILD_CORE true) - MESSAGE("Building Quassel core.") -ENDIF(BUILD MATCHES "core" OR BUILD MATCHES "all") -IF(BUILD MATCHES "gui" OR BUILD MATCHES "all") - SET(BUILD_QTGUI true) - MESSAGE("Building Quassel GUI for Qt.") -ENDIF(BUILD MATCHES "gui" OR BUILD MATCHES "all") -IF(BUILD MATCHES "mono" OR BUILD MATCHES "all") - SET(BUILD_MONO true) - MESSAGE("Building monolithic Quassel.") -ENDIF(BUILD MATCHES "mono" OR BUILD MATCHES "all") -IF(NOT BUILD_MONO AND NOT BUILD_CORE AND NOT BUILD_QTGUI) - MESSAGE(FATAL_ERROR "\nYou have not selected which parts of Quassel I should build. Aborting.\nRun 'cmake -DBUILD=', where contains one or more of 'core', 'gui' or 'monolithic', or 'all' to build everything.\n") -ENDIF(NOT BUILD_MONO AND NOT BUILD_CORE AND NOT BUILD_QTGUI) - -#IF(BUILD_CORE OR BUILD_QTGUI) -# MESSAGE(FATAL_ERROR "\nBuilding of standalone core or GUI not supported at this time. Please check back later.\n") -#ENDIF(BUILD_CORE OR BUILD_QTGUI) - -SET(CMAKE_BUILD_TYPE Debug) -SET(GCC_WARN "-Wall -Wextra -ansi -Wno-unused-parameter") # may not be portable! - -# Define files -SET(quassel_mono_SRCS common/build_mono.cpp) -SET(quassel_core_SRCS common/build_core.cpp) -SET(quassel_qtgui_SRCS common/build_qtgui.cpp) -SET(quassel_RCCS images/icons.qrc) -SET(quassel_DIRS common client core qtgui) - -# 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 contrib/qxt) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/qtgui) # so that ui files are found - -# We need Qt4 support. -SET(QT_MIN_VERSION "4.3.0") # 4.3 is required for SSL, crypto and some other stuff -FIND_PACKAGE(Qt4 REQUIRED) - -# Set needed libraries -SET(QT_USE_QTXML true) -SET(QT_USE_QTSQL true) -SET(QT_USE_QTNETWORK true) -SET(QT_USE_QTUITOOLS true) -SET(QT_DONT_USE_QTGUI true) # This is added later if GUI is requested -INCLUDE(${QT_USE_FILE}) - -ADD_DEFINITIONS(${GCC_WARN}) - -# 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(contrib/qxt) -ADD_SUBDIRECTORY(common) -IF(BUILD_CORE) - ADD_SUBDIRECTORY(core) -ENDIF(BUILD_CORE) -IF(BUILD_MONO AND NOT BUILD_CORE) - ADD_SUBDIRECTORY(core) -ENDIF(BUILD_MONO AND NOT BUILD_CORE) - -QT4_ADD_RESOURCES(_RCCS ${quassel_RCCS}) - -SET(TARGET_LIST ) - -IF(BUILD_CORE) - ADD_EXECUTABLE(quasselcore ${quassel_core_SRCS} ${_RCCS}) - TARGET_LINK_LIBRARIES(quasselcore common core ${QT_LIBRARIES}) - SET(TARGET_LIST ${TARGET_LIST} quasselcore) -ENDIF(BUILD_CORE) - -IF(BUILD_QTGUI OR BUILD_MONO) # OK, now we need QtGui! - REMOVE_DEFINITIONS(-DQT_CORE_LIB -DQT_GUI_LIB ${QT_DEFINITIONS}) - SET(QT_DONT_USE_QTGUI "") - SET(QT_INCLUDE_DIR "") - SET(QT_LIBRARIES "") - INCLUDE(${QT_USE_FILE}) - ADD_SUBDIRECTORY(client) - ADD_SUBDIRECTORY(qtgui) - - IF(BUILD_MONO) - ADD_EXECUTABLE(quassel ${quassel_mono_SRCS} ${_RCCS}) - TARGET_LINK_LIBRARIES(quassel common client core qtgui ${QT_LIBRARIES}) - SET(TARGET_LIST ${TARGET_LIST} quassel) - ENDIF(BUILD_MONO) - - IF(BUILD_QTGUI) - ADD_EXECUTABLE(quasselclient ${quassel_qtgui_SRCS} ${_RCCS}) - TARGET_LINK_LIBRARIES(quasselclient common client qtgui ${QT_LIBRARIES}) - SET(TARGET_LIST ${TARGET_LIST} quasselclient) - ENDIF(BUILD_QTGUI) - -ENDIF(BUILD_QTGUI OR BUILD_MONO) - -INSTALL(TARGETS ${TARGET_LIST} - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib/static) diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt deleted file mode 100644 index 7746c0f5..00000000 --- a/src/client/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -SET(client_SRCS buffer.cpp buffertreemodel.cpp client.cpp clientsettings.cpp treemodel.cpp) -SET(client_HDRS ) -SET(client_MOCS buffer.h buffertreemodel.h client.h clientsettings.h quasselui.h treemodel.h) - -QT4_WRAP_CPP(_MOC ${client_MOCS}) - -ADD_LIBRARY(client ${client_SRCS} ${_MOC}) -TARGET_LINK_LIBRARIES(client common) diff --git a/src/common/build_qtgui.cpp b/src/common/build_qtgui.cpp index 839850b8..4a75e783 100644 --- a/src/common/build_qtgui.cpp +++ b/src/common/build_qtgui.cpp @@ -18,5 +18,5 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#define BUILD_QTGUI +#define BUILD_QTUI #include "main.cpp" diff --git a/src/common/main.cpp b/src/common/main.cpp index e160c18e..7880e0ca 100644 --- a/src/common/main.cpp +++ b/src/common/main.cpp @@ -28,10 +28,10 @@ #include "core.h" #include "message.h" -#elif defined BUILD_QTGUI +#elif defined BUILD_QTUI #include #include "client.h" -#include "qtgui.h" +#include "qtui.h" #include "style.h" #elif defined BUILD_MONO @@ -39,7 +39,7 @@ #include "client.h" #include "core.h" #include "coresession.h" -#include "qtgui.h" +#include "qtui.h" #include "style.h" #else @@ -69,7 +69,7 @@ int main(int argc, char **argv) { #if defined BUILD_CORE Global::runMode = Global::CoreOnly; QCoreApplication app(argc, argv); -#elif defined BUILD_QTGUI +#elif defined BUILD_QTUI Global::runMode = Global::ClientOnly; QApplication app(argc, argv); #else @@ -88,7 +88,7 @@ int main(int argc, char **argv) { QCoreApplication::setOrganizationName("Quassel IRC Development Team"); Global::quasselDir = QDir::homePath() + "/.quassel"; -#ifndef BUILD_QTGUI +#ifndef BUILD_QTUI Core::instance(); // create and init the core #endif @@ -96,7 +96,7 @@ int main(int argc, char **argv) { #ifndef BUILD_CORE Style::init(); - QtGui *gui = new QtGui(); + QtUi *gui = new QtUi(); Client::init(gui); gui->init(); #endif @@ -110,14 +110,14 @@ int main(int argc, char **argv) { delete gui; Client::destroy(); #endif -#ifndef BUILD_QTGUI +#ifndef BUILD_QTUI Core::destroy(); #endif return exitCode; } -#ifdef BUILD_QTGUI +#ifdef BUILD_QTUI QVariant Client::connectToLocalCore(QString, QString) { return QVariant(); } void Client::disconnectFromLocalCore() {} diff --git a/src/qtgui/CMakeLists.txt b/src/qtgui/CMakeLists.txt deleted file mode 100644 index edd5c455..00000000 --- a/src/qtgui/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -SET(qtgui_SRCS bufferview.cpp bufferviewfilter.cpp bufferwidget.cpp channelwidgetinput.cpp chatline.cpp chatwidget.cpp coreconnectdlg.cpp - guisettings.cpp identities.cpp mainwin.cpp qtgui.cpp serverlist.cpp settingsdlg.cpp style.cpp tabcompleter.cpp) -SET(qtgui_HDRS style.h settingspage.h) -SET(qtgui_MOCS bufferview.h bufferviewfilter.h bufferwidget.h channelwidgetinput.h chatline.h chatwidget.h coreconnectdlg.h - guisettings.h identities.h mainwin.h qtgui.h serverlist.h settingsdlg.h tabcompleter.h) -SET(qtgui_UICS identitiesdlg.ui identitieseditdlg.ui networkeditdlg.ui mainwin.ui - nickeditdlg.ui serverlistdlg.ui servereditdlg.ui coreconnectdlg.ui - bufferviewwidget.ui bufferwidget.ui settingsdlg.ui - buffermgmtpage.ui connectionpage.ui usermgmtpage.ui) - -# This prepends ui/ to the UIC names, so we don't have to do this ourselves. -FOREACH(ui ${qtgui_UICS}) - SET(qtgui_UICS_UI ${qtgui_UICS_UI} "ui/${ui}") -ENDFOREACH(ui) - -QT4_WRAP_UI(_UIC ${qtgui_UICS_UI}) -QT4_WRAP_CPP(_MOC ${qtgui_MOCS}) - -#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) - -ADD_LIBRARY(qtgui ${qtgui_SRCS} ${_MOC} ${_UIC}) -TARGET_LINK_LIBRARIES(qtgui common client) \ No newline at end of file diff --git a/src/qtgui/mainwin.cpp b/src/qtgui/mainwin.cpp index fc4f8ed8..c24120b9 100644 --- a/src/qtgui/mainwin.cpp +++ b/src/qtgui/mainwin.cpp @@ -31,7 +31,7 @@ #include "topicwidget.h" -MainWin::MainWin(QtGui *_gui, QWidget *parent) : QMainWindow(parent), gui(_gui) { +MainWin::MainWin(QtUi *_gui, QWidget *parent) : QMainWindow(parent), gui(_gui) { ui.setupUi(this); setWindowTitle("Quassel IRC"); //setWindowTitle(QString::fromUtf8("Κυασελ Εγαρζη")); diff --git a/src/qtgui/mainwin.h b/src/qtgui/mainwin.h index c99b42fe..2e7bf640 100644 --- a/src/qtgui/mainwin.h +++ b/src/qtgui/mainwin.h @@ -23,22 +23,22 @@ #include "ui_mainwin.h" -#include "qtgui.h" +#include "qtui.h" #include "bufferviewfilter.h" class ServerListDlg; class CoreConnectDlg; class Buffer; class SettingsDlg; -class QtGui; +class QtUi; class Message; -//!\brief The main window of Quassel's QtGui. +//!\brief The main window of Quassel's QtUi. class MainWin : public QMainWindow { Q_OBJECT public: - MainWin(QtGui *gui, QWidget *parent = 0); + MainWin(QtUi *gui, QWidget *parent = 0); virtual ~MainWin(); void init(); @@ -73,7 +73,7 @@ class MainWin : public QMainWindow { private: Ui::MainWin ui; - QtGui *gui; + QtUi *gui; void setupMenus(); void setupViews(); @@ -92,7 +92,7 @@ class MainWin : public QMainWindow { QList netViews; - friend class QtGui; + friend class QtUi; }; #endif diff --git a/src/qtgui/qtgui.cpp b/src/qtgui/qtgui.cpp index 985a9ad5..157aafe1 100644 --- a/src/qtgui/qtgui.cpp +++ b/src/qtgui/qtgui.cpp @@ -18,33 +18,33 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "qtgui.h" +#include "qtui.h" #include "mainwin.h" -QtGui::QtGui() : AbstractUi() { +QtUi::QtUi() : AbstractUi() { mainWin = new MainWin(this); connect(mainWin, SIGNAL(connectToCore(const QVariantMap &)), this, SIGNAL(connectToCore(const QVariantMap &))); connect(mainWin, SIGNAL(disconnectFromCore()), this, SIGNAL(disconnectFromCore())); } -QtGui::~QtGui() { +QtUi::~QtUi() { delete mainWin; } -void QtGui::init() { +void QtUi::init() { mainWin->init(); } -AbstractUiMsg *QtGui::layoutMsg(const Message &msg) { +AbstractUiMsg *QtUi::layoutMsg(const Message &msg) { return mainWin->layoutMsg(msg); } -void QtGui::connectedToCore() { +void QtUi::connectedToCore() { mainWin->connectedToCore(); } -void QtGui::disconnectedFromCore() { +void QtUi::disconnectedFromCore() { mainWin->disconnectedFromCore(); } diff --git a/src/qtgui/qtgui.h b/src/qtgui/qtgui.h index 429127ab..dca9658a 100644 --- a/src/qtgui/qtgui.h +++ b/src/qtgui/qtgui.h @@ -18,8 +18,8 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef _QTGUI_H_ -#define _QTGUI_H_ +#ifndef _QTUI_H_ +#define _QTUI_H_ #include "quasselui.h" class MainWin; @@ -28,12 +28,12 @@ class MainWin; /** This is basically a wrapper around MainWin, which is necessary because we cannot derive MainWin * from both QMainWindow and AbstractUi (because of multiple inheritance of QObject). */ -class QtGui : public AbstractUi { +class QtUi : public AbstractUi { Q_OBJECT public: - QtGui(); - ~QtGui(); + QtUi(); + ~QtUi(); void init(); AbstractUiMsg *layoutMsg(const Message &); diff --git a/src/qtgui/qtgui.pri b/src/qtgui/qtgui.pri index 914b80f9..852bb311 100644 --- a/src/qtgui/qtgui.pri +++ b/src/qtgui/qtgui.pri @@ -3,10 +3,10 @@ QT_MOD = core gui network SRCS += bufferview.cpp bufferviewfilter.cpp bufferwidget.cpp channelwidgetinput.cpp chatline.cpp \ chatwidget.cpp coreconnectdlg.cpp \ - guisettings.cpp identities.cpp mainwin.cpp qtgui.cpp serverlist.cpp settingsdlg.cpp style.cpp tabcompleter.cpp topicwidget.cpp + guisettings.cpp identities.cpp mainwin.cpp qtui.cpp serverlist.cpp settingsdlg.cpp style.cpp tabcompleter.cpp topicwidget.cpp HDRS += bufferview.h bufferviewfilter.h bufferwidget.h channelwidgetinput.h chatline.h chatwidget.h coreconnectdlg.h \ - guisettings.h identities.h mainwin.h qtgui.h serverlist.h settingsdlg.h settingspage.h style.h tabcompleter.h topicwidget.h + guisettings.h identities.h mainwin.h qtui.h serverlist.h settingsdlg.h settingspage.h style.h tabcompleter.h topicwidget.h FORMNAMES = identitiesdlg.ui identitieseditdlg.ui networkeditdlg.ui mainwin.ui nickeditdlg.ui serverlistdlg.ui \