Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-06-10 17:23:57 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-06-10 17:38:05 (GMT)
commite2f5588d089e4d2148762ea092e032976254a467 (patch)
tree851946c7a36ffa96e0f3ab54bc72f233f8b2c746
parent7214d768dca85a6d43892169d5008898249dce73 (diff)
downloadswift-e2f5588d089e4d2148762ea092e032976254a467.zip
swift-e2f5588d089e4d2148762ea092e032976254a467.tar.bz2
Moved Swiften/Controllers to Swift/Controllers.
Diffstat
-rw-r--r--Makefile3
-rw-r--r--Swift/Controllers/ChatController.cpp (renamed from Swiften/Controllers/ChatController.cpp)8
-rw-r--r--Swift/Controllers/ChatController.h (renamed from Swiften/Controllers/ChatController.h)2
-rw-r--r--Swift/Controllers/ChatControllerBase.cpp (renamed from Swiften/Controllers/ChatControllerBase.cpp)6
-rw-r--r--Swift/Controllers/ChatControllerBase.h (renamed from Swiften/Controllers/ChatControllerBase.h)0
-rw-r--r--Swift/Controllers/ChatWindow.h (renamed from Swiften/Controllers/ChatWindow.h)0
-rw-r--r--Swift/Controllers/ChatWindowFactory.h (renamed from Swiften/Controllers/ChatWindowFactory.h)0
-rw-r--r--Swift/Controllers/EventController.cpp (renamed from Swiften/Controllers/EventController.cpp)2
-rw-r--r--Swift/Controllers/EventController.h (renamed from Swiften/Controllers/EventController.h)0
-rw-r--r--Swift/Controllers/LoginWindow.h (renamed from Swiften/Controllers/LoginWindow.h)0
-rw-r--r--Swift/Controllers/LoginWindowFactory.h (renamed from Swiften/Controllers/LoginWindowFactory.h)0
-rw-r--r--Swift/Controllers/MUCController.cpp (renamed from Swiften/Controllers/MUCController.cpp)6
-rw-r--r--Swift/Controllers/MUCController.h (renamed from Swiften/Controllers/MUCController.h)2
-rw-r--r--Swift/Controllers/MainController.cpp (renamed from Swiften/Controllers/MainController.cpp)24
-rw-r--r--Swift/Controllers/MainController.h (renamed from Swiften/Controllers/MainController.h)0
-rw-r--r--Swift/Controllers/MainWindow.h (renamed from Swiften/Controllers/MainWindow.h)0
-rw-r--r--Swift/Controllers/MainWindowFactory.h (renamed from Swiften/Controllers/MainWindowFactory.h)0
-rw-r--r--Swift/Controllers/Makefile.inc22
-rw-r--r--Swift/Controllers/NickResolver.cpp (renamed from Swiften/Controllers/NickResolver.cpp)2
-rw-r--r--Swift/Controllers/NickResolver.h (renamed from Swiften/Controllers/NickResolver.h)0
-rw-r--r--Swift/Controllers/RosterController.cpp (renamed from Swiften/Controllers/RosterController.cpp)6
-rw-r--r--Swift/Controllers/RosterController.h (renamed from Swiften/Controllers/RosterController.h)0
-rw-r--r--Swift/Controllers/UnitTest/Makefile.inc4
-rw-r--r--Swift/Controllers/UnitTest/NickResolverTest.cpp (renamed from Swiften/Controllers/UnitTest/NickResolverTest.cpp)2
-rw-r--r--Swift/Controllers/UnitTest/XMPPRosterControllerTest.cpp (renamed from Swiften/Controllers/UnitTest/XMPPRosterControllerTest.cpp)2
-rw-r--r--Swift/Controllers/XMPPRosterController.cpp (renamed from Swiften/Controllers/XMPPRosterController.cpp)6
-rw-r--r--Swift/Controllers/XMPPRosterController.h (renamed from Swiften/Controllers/XMPPRosterController.h)0
-rw-r--r--Swift/Makefile.inc2
-rw-r--r--Swift/QtUI/QtChatWindow.h2
-rw-r--r--Swift/QtUI/QtChatWindowFactory.h2
-rw-r--r--Swift/QtUI/QtLoginWindow.h4
-rw-r--r--Swift/QtUI/QtLoginWindowFactory.h2
-rw-r--r--Swift/QtUI/QtMainWindow.h2
-rw-r--r--Swift/QtUI/QtMainWindowFactory.h2
-rw-r--r--Swift/QtUI/QtSwift.cpp4
-rw-r--r--Swift/QtUI/Swift.pro2
-rwxr-xr-xSwift/QtUI/qmakeish.py2
-rw-r--r--Swiften/Controllers/Makefile.inc11
-rw-r--r--Swiften/Controllers/UnitTest/Makefile.inc4
-rw-r--r--Swiften/Makefile.inc3
-rw-r--r--Swiften/QA/UnitTest/Makefile.inc4
41 files changed, 78 insertions, 65 deletions
diff --git a/Makefile b/Makefile
index d93ac2b..0cddb30 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,8 @@ include 3rdParty/ZLib/Makefile.inc
include 3rdParty/Expat/Makefile.inc
include 3rdParty/SQLite/Makefile.inc
include Swiften/Makefile.inc
-include Swift/QtUI/Makefile.inc
+include Swift/Makefile.inc
+include Swiften/QA/Makefile.inc
################################################################################
# Main targets
diff --git a/Swiften/Controllers/ChatController.cpp b/Swift/Controllers/ChatController.cpp
index bac73d4..8c0b8bb 100644
--- a/Swiften/Controllers/ChatController.cpp
+++ b/Swift/Controllers/ChatController.cpp
@@ -1,8 +1,8 @@
-#include "Swiften/Controllers/ChatController.h"
+#include "Swift/Controllers/ChatController.h"
-#include "Swiften/Controllers/ChatWindow.h"
-#include "Swiften/Controllers/ChatWindowFactory.h"
-#include "Swiften/Controllers/NickResolver.h"
+#include "Swift/Controllers/ChatWindow.h"
+#include "Swift/Controllers/ChatWindowFactory.h"
+#include "Swift/Controllers/NickResolver.h"
namespace Swift {
diff --git a/Swiften/Controllers/ChatController.h b/Swift/Controllers/ChatController.h
index 314bd70..98e66bc 100644
--- a/Swiften/Controllers/ChatController.h
+++ b/Swift/Controllers/ChatController.h
@@ -1,7 +1,7 @@
#ifndef SWIFTEN_ChatController_H
#define SWIFTEN_ChatController_H
-#include "Swiften/Controllers/ChatControllerBase.h"
+#include "Swift/Controllers/ChatControllerBase.h"
namespace Swift {
class NickResolver;
diff --git a/Swiften/Controllers/ChatControllerBase.cpp b/Swift/Controllers/ChatControllerBase.cpp
index 5f8535e..3b3ddb7 100644
--- a/Swiften/Controllers/ChatControllerBase.cpp
+++ b/Swift/Controllers/ChatControllerBase.cpp
@@ -1,12 +1,12 @@
-#include "Swiften/Controllers/ChatControllerBase.h"
+#include "Swift/Controllers/ChatControllerBase.h"
#include <boost/bind.hpp>
#include <boost/shared_ptr.hpp>
#include "Swiften/Client/StanzaChannel.h"
#include "Swiften/Base/foreach.h"
-#include "Swiften/Controllers/ChatWindow.h"
-#include "Swiften/Controllers/ChatWindowFactory.h"
+#include "Swift/Controllers/ChatWindow.h"
+#include "Swift/Controllers/ChatWindowFactory.h"
#include "Swiften/Queries/Requests/GetSecurityLabelsCatalogRequest.h"
namespace Swift {
diff --git a/Swiften/Controllers/ChatControllerBase.h b/Swift/Controllers/ChatControllerBase.h
index 1967977..1967977 100644
--- a/Swiften/Controllers/ChatControllerBase.h
+++ b/Swift/Controllers/ChatControllerBase.h
diff --git a/Swiften/Controllers/ChatWindow.h b/Swift/Controllers/ChatWindow.h
index 04d0007..04d0007 100644
--- a/Swiften/Controllers/ChatWindow.h
+++ b/Swift/Controllers/ChatWindow.h
diff --git a/Swiften/Controllers/ChatWindowFactory.h b/Swift/Controllers/ChatWindowFactory.h
index c55ddba..c55ddba 100644
--- a/Swiften/Controllers/ChatWindowFactory.h
+++ b/Swift/Controllers/ChatWindowFactory.h
diff --git a/Swiften/Controllers/EventController.cpp b/Swift/Controllers/EventController.cpp
index a87f79a..9b143dd 100644
--- a/Swiften/Controllers/EventController.cpp
+++ b/Swift/Controllers/EventController.cpp
@@ -1,4 +1,4 @@
-#include "Swiften/Controllers/EventController.h"
+#include "Swift/Controllers/EventController.h"
#include <boost/bind.hpp>
#include <algorithm>
diff --git a/Swiften/Controllers/EventController.h b/Swift/Controllers/EventController.h
index ab161af..ab161af 100644
--- a/Swiften/Controllers/EventController.h
+++ b/Swift/Controllers/EventController.h
diff --git a/Swiften/Controllers/LoginWindow.h b/Swift/Controllers/LoginWindow.h
index 44855c0..44855c0 100644
--- a/Swiften/Controllers/LoginWindow.h
+++ b/Swift/Controllers/LoginWindow.h
diff --git a/Swiften/Controllers/LoginWindowFactory.h b/Swift/Controllers/LoginWindowFactory.h
index d52325e..d52325e 100644
--- a/Swiften/Controllers/LoginWindowFactory.h
+++ b/Swift/Controllers/LoginWindowFactory.h
diff --git a/Swiften/Controllers/MUCController.cpp b/Swift/Controllers/MUCController.cpp
index 8137fe1..93880c4 100644
--- a/Swiften/Controllers/MUCController.cpp
+++ b/Swift/Controllers/MUCController.cpp
@@ -1,10 +1,10 @@
-#include "Swiften/Controllers/MUCController.h"
+#include "Swift/Controllers/MUCController.h"
#include <boost/bind.hpp>
#include "Swiften/Base/foreach.h"
-#include "Swiften/Controllers/ChatWindow.h"
-#include "Swiften/Controllers/ChatWindowFactory.h"
+#include "Swift/Controllers/ChatWindow.h"
+#include "Swift/Controllers/ChatWindowFactory.h"
#include "Swiften/MUC/MUC.h"
#include "Swiften/Client/StanzaChannel.h"
#include "Swiften/Roster/Roster.h"
diff --git a/Swiften/Controllers/MUCController.h b/Swift/Controllers/MUCController.h
index a7859cf..c87695e 100644
--- a/Swiften/Controllers/MUCController.h
+++ b/Swift/Controllers/MUCController.h
@@ -4,7 +4,7 @@
#include <boost/shared_ptr.hpp>
#include "Swiften/Base/String.h"
-#include "Swiften/Controllers/ChatControllerBase.h"
+#include "Swift/Controllers/ChatControllerBase.h"
#include "Swiften/Elements/Message.h"
#include "Swiften/Elements/DiscoInfo.h"
#include "Swiften/JID/JID.h"
diff --git a/Swiften/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index 5535bf8..e5036a5 100644
--- a/Swiften/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -1,4 +1,4 @@
-#include "Swiften/Controllers/MainController.h"
+#include "Swift/Controllers/MainController.h"
#include <boost/bind.hpp>
#include <boost/lexical_cast.hpp>
@@ -7,17 +7,17 @@
#include "Swiften/Application/Application.h"
#include "Swiften/Application/ApplicationMessageDisplay.h"
-#include "Swiften/Controllers/ChatController.h"
-#include "Swiften/Controllers/ChatWindowFactory.h"
-#include "Swiften/Controllers/EventController.h"
-#include "Swiften/Controllers/LoginWindow.h"
-#include "Swiften/Controllers/LoginWindowFactory.h"
-#include "Swiften/Controllers/MainWindow.h"
-#include "Swiften/Controllers/MainWindowFactory.h"
-#include "Swiften/Controllers/MUCController.h"
-#include "Swiften/Controllers/NickResolver.h"
-#include "Swiften/Controllers/RosterController.h"
-#include "Swiften/Controllers/XMPPRosterController.h"
+#include "Swift/Controllers/ChatController.h"
+#include "Swift/Controllers/ChatWindowFactory.h"
+#include "Swift/Controllers/EventController.h"
+#include "Swift/Controllers/LoginWindow.h"
+#include "Swift/Controllers/LoginWindowFactory.h"
+#include "Swift/Controllers/MainWindow.h"
+#include "Swift/Controllers/MainWindowFactory.h"
+#include "Swift/Controllers/MUCController.h"
+#include "Swift/Controllers/NickResolver.h"
+#include "Swift/Controllers/RosterController.h"
+#include "Swift/Controllers/XMPPRosterController.h"
#include "Swiften/Base/foreach.h"
#include "Swiften/Base/String.h"
#include "Swiften/Client/Client.h"
diff --git a/Swiften/Controllers/MainController.h b/Swift/Controllers/MainController.h
index e09d4fa..e09d4fa 100644
--- a/Swiften/Controllers/MainController.h
+++ b/Swift/Controllers/MainController.h
diff --git a/Swiften/Controllers/MainWindow.h b/Swift/Controllers/MainWindow.h
index 081fe6e..081fe6e 100644
--- a/Swiften/Controllers/MainWindow.h
+++ b/Swift/Controllers/MainWindow.h
diff --git a/Swiften/Controllers/MainWindowFactory.h b/Swift/Controllers/MainWindowFactory.h
index cf5a061..cf5a061 100644
--- a/Swiften/Controllers/MainWindowFactory.h
+++ b/Swift/Controllers/MainWindowFactory.h
diff --git a/Swift/Controllers/Makefile.inc b/Swift/Controllers/Makefile.inc
new file mode 100644
index 0000000..ff3192e
--- /dev/null
+++ b/Swift/Controllers/Makefile.inc
@@ -0,0 +1,22 @@
+SWIFT_CONTROLLERS_SOURCES += \
+ Swift/Controllers/ChatController.cpp \
+ Swift/Controllers/ChatControllerBase.cpp \
+ Swift/Controllers/MainController.cpp \
+ Swift/Controllers/NickResolver.cpp \
+ Swift/Controllers/RosterController.cpp \
+ Swift/Controllers/XMPPRosterController.cpp \
+ Swift/Controllers/MUCController.cpp \
+ Swift/Controllers/EventController.cpp
+
+include Swift/Controllers/UnitTest/Makefile.inc
+
+SWIFT_CONTROLLERS_TARGET = Swift/Controllers/Controllers.a
+SWIFT_CONTROLLERS_OBJECTS = \
+ $(SWIFT_CONTROLLERS_SOURCES:.cpp=.o)
+
+TARGETS += $(SWIFT_CONTROLLERS_TARGET)
+UNITTEST_LIBS += $(SWIFT_CONTROLLERS_TARGET)
+CLEANFILES += $(SWIFT_CONTROLLERS_TARGET) $(SWIFT_CONTROLLERS_OBJECTS)
+
+$(SWIFT_CONTROLLERS_TARGET): $(SWIFT_CONTROLLERS_OBJECTS)
+ $(QUIET_AR)$(AR) $(ARFLAGS) $@ $(SWIFT_CONTROLLERS_OBJECTS)
diff --git a/Swiften/Controllers/NickResolver.cpp b/Swift/Controllers/NickResolver.cpp
index 1c51cb7..db1d2b4 100644
--- a/Swiften/Controllers/NickResolver.cpp
+++ b/Swift/Controllers/NickResolver.cpp
@@ -1,4 +1,4 @@
-#include "Swiften/Controllers/NickResolver.h"
+#include "Swift/Controllers/NickResolver.h"
#include <boost/shared_ptr.hpp>
diff --git a/Swiften/Controllers/NickResolver.h b/Swift/Controllers/NickResolver.h
index b7dc005..b7dc005 100644
--- a/Swiften/Controllers/NickResolver.h
+++ b/Swift/Controllers/NickResolver.h
diff --git a/Swiften/Controllers/RosterController.cpp b/Swift/Controllers/RosterController.cpp
index 1efbeea..c447602 100644
--- a/Swiften/Controllers/RosterController.cpp
+++ b/Swift/Controllers/RosterController.cpp
@@ -1,10 +1,10 @@
-#include "Swiften/Controllers/RosterController.h"
+#include "Swift/Controllers/RosterController.h"
#include <boost/bind.hpp>
#include "Swiften/Base/foreach.h"
-#include "Swiften/Controllers/MainWindow.h"
-#include "Swiften/Controllers/MainWindowFactory.h"
+#include "Swift/Controllers/MainWindow.h"
+#include "Swift/Controllers/MainWindowFactory.h"
#include "Swiften/Queries/Requests/GetRosterRequest.h"
#include "Swiften/EventLoop/MainEventLoop.h"
#include "Swiften/Roster/Roster.h"
diff --git a/Swiften/Controllers/RosterController.h b/Swift/Controllers/RosterController.h
index 945b068..945b068 100644
--- a/Swiften/Controllers/RosterController.h
+++ b/Swift/Controllers/RosterController.h
diff --git a/Swift/Controllers/UnitTest/Makefile.inc b/Swift/Controllers/UnitTest/Makefile.inc
new file mode 100644
index 0000000..254f35d
--- /dev/null
+++ b/Swift/Controllers/UnitTest/Makefile.inc
@@ -0,0 +1,4 @@
+UNITTEST_SOURCES += \
+ Swift/Controllers/UnitTest/NickResolverTest.cpp \
+ Swift/Controllers/UnitTest/XMPPRosterControllerTest.cpp
+
diff --git a/Swiften/Controllers/UnitTest/NickResolverTest.cpp b/Swift/Controllers/UnitTest/NickResolverTest.cpp
index 9c89d4d..947d3d8 100644
--- a/Swiften/Controllers/UnitTest/NickResolverTest.cpp
+++ b/Swift/Controllers/UnitTest/NickResolverTest.cpp
@@ -1,7 +1,7 @@
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
-#include "Swiften/Controllers/NickResolver.h"
+#include "Swift/Controllers/NickResolver.h"
#include "Swiften/Roster/XMPPRoster.h"
using namespace Swift;
diff --git a/Swiften/Controllers/UnitTest/XMPPRosterControllerTest.cpp b/Swift/Controllers/UnitTest/XMPPRosterControllerTest.cpp
index 17cc31c..c1d53c6 100644
--- a/Swiften/Controllers/UnitTest/XMPPRosterControllerTest.cpp
+++ b/Swift/Controllers/UnitTest/XMPPRosterControllerTest.cpp
@@ -1,7 +1,7 @@
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
-#include "Swiften/Controllers/XMPPRosterController.h"
+#include "Swift/Controllers/XMPPRosterController.h"
#include "Swiften/Elements/Payload.h"
#include "Swiften/Elements/RosterItemPayload.h"
#include "Swiften/Elements/RosterPayload.h"
diff --git a/Swiften/Controllers/XMPPRosterController.cpp b/Swift/Controllers/XMPPRosterController.cpp
index d1e6f80..6bbc964 100644
--- a/Swiften/Controllers/XMPPRosterController.cpp
+++ b/Swift/Controllers/XMPPRosterController.cpp
@@ -1,10 +1,10 @@
-#include "Swiften/Controllers/XMPPRosterController.h"
+#include "Swift/Controllers/XMPPRosterController.h"
#include <boost/bind.hpp>
#include "Swiften/Base/foreach.h"
-#include "Swiften/Controllers/MainWindow.h"
-#include "Swiften/Controllers/MainWindowFactory.h"
+#include "Swift/Controllers/MainWindow.h"
+#include "Swift/Controllers/MainWindowFactory.h"
#include "Swiften/Elements/RosterItemPayload.h"
#include "Swiften/Queries/IQRouter.h"
#include "Swiften/Queries/Requests/GetRosterRequest.h"
diff --git a/Swiften/Controllers/XMPPRosterController.h b/Swift/Controllers/XMPPRosterController.h
index 7695ff5..7695ff5 100644
--- a/Swiften/Controllers/XMPPRosterController.h
+++ b/Swift/Controllers/XMPPRosterController.h
diff --git a/Swift/Makefile.inc b/Swift/Makefile.inc
new file mode 100644
index 0000000..1a88144
--- /dev/null
+++ b/Swift/Makefile.inc
@@ -0,0 +1,2 @@
+include Swift/Controllers/Makefile.inc
+include Swift/QtUI/Makefile.inc
diff --git a/Swift/QtUI/QtChatWindow.h b/Swift/QtUI/QtChatWindow.h
index ef091e3..8b830d1 100644
--- a/Swift/QtUI/QtChatWindow.h
+++ b/Swift/QtUI/QtChatWindow.h
@@ -1,7 +1,7 @@
#ifndef SWIFT_QtChatWindow_H
#define SWIFT_QtChatWindow_H
-#include "Swiften/Controllers/ChatWindow.h"
+#include "Swift/Controllers/ChatWindow.h"
#include <QWidget>
diff --git a/Swift/QtUI/QtChatWindowFactory.h b/Swift/QtUI/QtChatWindowFactory.h
index 9e5004e..bda4c01 100644
--- a/Swift/QtUI/QtChatWindowFactory.h
+++ b/Swift/QtUI/QtChatWindowFactory.h
@@ -1,7 +1,7 @@
#ifndef SWIFT_QtChatWindowFactory_H
#define SWIFT_QtChatWindowFactory_H
-#include "Swiften/Controllers/ChatWindowFactory.h"
+#include "Swift/Controllers/ChatWindowFactory.h"
#include "Swiften/JID/JID.h"
namespace Swift {
diff --git a/Swift/QtUI/QtLoginWindow.h b/Swift/QtUI/QtLoginWindow.h
index 5a14202..173a6b9 100644
--- a/Swift/QtUI/QtLoginWindow.h
+++ b/Swift/QtUI/QtLoginWindow.h
@@ -7,8 +7,8 @@
#include <QCheckBox>
#include <QStackedWidget>
-#include "Swiften/Controllers/LoginWindow.h"
-#include "Swiften/Controllers/MainWindow.h"
+#include "Swift/Controllers/LoginWindow.h"
+#include "Swift/Controllers/MainWindow.h"
class QLabel;
class QToolButton;
diff --git a/Swift/QtUI/QtLoginWindowFactory.h b/Swift/QtUI/QtLoginWindowFactory.h
index 52f92c8..17f2453 100644
--- a/Swift/QtUI/QtLoginWindowFactory.h
+++ b/Swift/QtUI/QtLoginWindowFactory.h
@@ -1,7 +1,7 @@
#ifndef SWIFT_QtLoginWindowFactory_H
#define SWIFT_QtLoginWindowFactory_H
-#include "Swiften/Controllers/LoginWindowFactory.h"
+#include "Swift/Controllers/LoginWindowFactory.h"
namespace Swift {
class QtLoginWindowFactory : public LoginWindowFactory{
diff --git a/Swift/QtUI/QtMainWindow.h b/Swift/QtUI/QtMainWindow.h
index fe5c8b4..6f4b5f7 100644
--- a/Swift/QtUI/QtMainWindow.h
+++ b/Swift/QtUI/QtMainWindow.h
@@ -3,7 +3,7 @@
#include <QWidget>
#include <QMenu>
-#include "Swiften/Controllers/MainWindow.h"
+#include "Swift/Controllers/MainWindow.h"
#include <vector>
diff --git a/Swift/QtUI/QtMainWindowFactory.h b/Swift/QtUI/QtMainWindowFactory.h
index 86fc02f..1e45b23 100644
--- a/Swift/QtUI/QtMainWindowFactory.h
+++ b/Swift/QtUI/QtMainWindowFactory.h
@@ -1,7 +1,7 @@
#ifndef SWIFT_QtMainWindowFactory_H
#define SWIFT_QtMainWindowFactory_H
-#include "Swiften/Controllers/MainWindowFactory.h"
+#include "Swift/Controllers/MainWindowFactory.h"
namespace Swift {
class QtTreeWidgetFactory;
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
index e7d4152..b8b45a1 100644
--- a/Swift/QtUI/QtSwift.cpp
+++ b/Swift/QtUI/QtSwift.cpp
@@ -12,8 +12,8 @@
#include "Swiften/Base/String.h"
#include "Swiften/Elements/Presence.h"
#include "Swiften/Client/Client.h"
-#include "Swiften/Controllers/ChatController.h"
-#include "Swiften/Controllers/MainController.h"
+#include "Swift/Controllers/ChatController.h"
+#include "Swift/Controllers/MainController.h"
namespace Swift{
diff --git a/Swift/QtUI/Swift.pro b/Swift/QtUI/Swift.pro
index 16db0d1..1c860b4 100644
--- a/Swift/QtUI/Swift.pro
+++ b/Swift/QtUI/Swift.pro
@@ -27,7 +27,7 @@ win32 {
else {
DEPENDPATH += . ../.. ../../3rdParty/Boost
INCLUDEPATH += . ../.. ../../3rdParty/Boost
- LIBS += ../../Swiften/Swiften.a -lexpat -lssl -lcrypto
+ LIBS += ../Controllers/Controllers.a ../../Swiften/Swiften.a -lexpat -lssl -lcrypto
unix {
LIBS += -lresolv
}
diff --git a/Swift/QtUI/qmakeish.py b/Swift/QtUI/qmakeish.py
index 72a5f62..178696d 100755
--- a/Swift/QtUI/qmakeish.py
+++ b/Swift/QtUI/qmakeish.py
@@ -80,7 +80,7 @@ for line in makefile :
continue
match = re.match("(\w+)_SOURCES (\+?)= (.*)", line)
- if match and match.group(1) in ["SWIFTEN", "ZLIB", "LIBIDN", "BOOST", "EXPAT"] :
+ if match and match.group(1) in ["SWIFTEN", "ZLIB", "LIBIDN", "BOOST", "EXPAT", "SWIFT_CONTROLLERS"] :
inSources = processSourcesLine(match.group(3))
continue
diff --git a/Swiften/Controllers/Makefile.inc b/Swiften/Controllers/Makefile.inc
deleted file mode 100644
index c51b0f3..0000000
--- a/Swiften/Controllers/Makefile.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SWIFTEN_SOURCES += \
- Swiften/Controllers/ChatController.cpp \
- Swiften/Controllers/ChatControllerBase.cpp \
- Swiften/Controllers/MainController.cpp \
- Swiften/Controllers/NickResolver.cpp \
- Swiften/Controllers/RosterController.cpp \
- Swiften/Controllers/XMPPRosterController.cpp \
- Swiften/Controllers/MUCController.cpp \
- Swiften/Controllers/EventController.cpp
-
-include Swiften/Controllers/UnitTest/Makefile.inc
diff --git a/Swiften/Controllers/UnitTest/Makefile.inc b/Swiften/Controllers/UnitTest/Makefile.inc
deleted file mode 100644
index 163da01..0000000
--- a/Swiften/Controllers/UnitTest/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-UNITTEST_SOURCES += \
- Swiften/Controllers/UnitTest/NickResolverTest.cpp \
- Swiften/Controllers/UnitTest/XMPPRosterControllerTest.cpp
-
diff --git a/Swiften/Makefile.inc b/Swiften/Makefile.inc
index 7eca8a5..bb93bf8 100644
--- a/Swiften/Makefile.inc
+++ b/Swiften/Makefile.inc
@@ -15,7 +15,6 @@ include Swiften/TLS/Makefile.inc
include Swiften/SASL/Makefile.inc
include Swiften/Compress/Makefile.inc
include Swiften/Queries/Makefile.inc
-include Swiften/Controllers/Makefile.inc
include Swiften/Roster/Makefile.inc
include Swiften/Disco/Makefile.inc
include Swiften/Presence/Makefile.inc
@@ -34,6 +33,7 @@ SWIFTEN_OBJECTS = \
$(SQLITE_OBJECTS)
TARGETS += $(SWIFTEN_TARGET)
+UNITTEST_LIBS += $(SWIFTEN_TARGET)
CLEANFILES += $(SWIFTEN_TARGET) $(SWIFTEN_OBJECTS)
.PHONY: lib
@@ -43,4 +43,3 @@ $(SWIFTEN_TARGET): $(SWIFTEN_OBJECTS)
$(QUIET_AR)$(AR) $(ARFLAGS) $@ $(SWIFTEN_OBJECTS)
include Swiften/Examples/Makefile.inc
-include Swiften/QA/Makefile.inc
diff --git a/Swiften/QA/UnitTest/Makefile.inc b/Swiften/QA/UnitTest/Makefile.inc
index 7f31da3..5bdbec9 100644
--- a/Swiften/QA/UnitTest/Makefile.inc
+++ b/Swiften/QA/UnitTest/Makefile.inc
@@ -12,6 +12,6 @@ CLEANFILES += $(UNITTEST_OBJECTS) $(UNITTEST_TARGET)
check: $(UNITTEST_TARGET)
$(TEST_RUNNER) ./$(UNITTEST_TARGET)
-$(UNITTEST_TARGET): $(SWIFTEN_TARGET) $(CPPUNIT_TARGET) $(UNITTEST_OBJECTS) $(BUNDLED_LIBS)
- $(QUIET_LINK)$(CXX) -o $(UNITTEST_TARGET) $(UNITTEST_OBJECTS) $(LDFLAGS) $(SWIFTEN_TARGET) $(CPPUNIT_TARGET) $(BUNDLED_LIBS) $(LIBS)
+$(UNITTEST_TARGET): $(CPPUNIT_TARGET) $(UNITTEST_OBJECTS) $(UNITTEST_LIBS) $(BUNDLED_LIBS)
+ $(QUIET_LINK)$(CXX) -o $(UNITTEST_TARGET) $(UNITTEST_OBJECTS) $(LDFLAGS) $(CPPUNIT_TARGET) $(UNITTEST_LIBS) $(BUNDLED_LIBS) $(LIBS)