summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2013-10-03 15:28:07 (GMT)
committerKevin Smith <git@kismith.co.uk>2013-10-03 15:28:07 (GMT)
commitcf2d0c9db8176a9b53e551fee8597686cdfe0eda (patch)
treeaa4779a3fba7aca7ee9708f50717f69282ccad04
parentc60529de29ceda701da00080b59eab785d91f726 (diff)
downloadswift-contrib-cf2d0c9db8176a9b53e551fee8597686cdfe0eda.zip
swift-contrib-cf2d0c9db8176a9b53e551fee8597686cdfe0eda.tar.bz2
Reformat the includes for QtChatWindow
Change-Id: Ibb9832c1aeae5af08ff0351b5ef5b9335a612539
-rw-r--r--Swift/QtUI/QtChatWindow.cpp58
1 files changed, 30 insertions, 28 deletions
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index 2b68475..224f343 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -4,52 +4,54 @@
* See Documentation/Licenses/GPLv3.txt for more information.
*/
-#include "QtChatWindow.h"
-#include "Swift/Controllers/Roster/Roster.h"
-#include "Swift/Controllers/Roster/RosterItem.h"
-#include "Swift/Controllers/Roster/ContactRosterItem.h"
-#include "Roster/QtOccupantListWidget.h"
-#include "SwifTools/Linkify.h"
-#include "QtWebKitChatView.h"
-#include "QtTextEdit.h"
-#include "QtSettingsProvider.h"
-#include "QtScaledAvatarCache.h"
-#include <Swift/QtUI/QtUISettingConstants.h>
-
-#include "SwifTools/TabComplete.h"
-#include <Swift/Controllers/UIEvents/UIEventStream.h>
-#include <Swift/Controllers/UIEvents/SendFileUIEvent.h>
-#include <Swift/Controllers/UIEvents/JoinMUCUIEvent.h>
-#include "QtUtilities.h"
+#include <Swift/QtUI/QtChatWindow.h>
#include <boost/cstdint.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
#include <boost/lexical_cast.hpp>
+#include <boost/smart_ptr/make_shared.hpp>
-#include <QLabel>
#include <qdebug.h>
-#include <QMessageBox>
-#include <QMimeData>
-#include <QInputDialog>
#include <QApplication>
#include <QBoxLayout>
#include <QCloseEvent>
#include <QComboBox>
+#include <QFileDialog>
#include <QFileInfo>
+#include <QInputDialog>
+#include <QLabel>
#include <QLineEdit>
+#include <QMenu>
+#include <QMessageBox>
+#include <QMimeData>
+#include <QPushButton>
#include <QSplitter>
#include <QString>
+#include <QTextDocument>
#include <QTextEdit>
#include <QTime>
-#include <QUrl>
#include <QToolButton>
-#include <QPushButton>
-#include <QFileDialog>
-#include <QMenu>
-#include <QTextDocument>
-#include <Swift/Controllers/Settings/SettingsProvider.h>
+#include <QUrl>
+
#include <Swiften/Base/Log.h>
+#include <Swift/Controllers/Roster/ContactRosterItem.h>
+#include <Swift/Controllers/Roster/Roster.h>
+#include <Swift/Controllers/Roster/RosterItem.h>
+#include <Swift/Controllers/Settings/SettingsProvider.h>
+#include <Swift/Controllers/UIEvents/UIEventStream.h>
+#include <Swift/Controllers/UIEvents/SendFileUIEvent.h>
+#include <Swift/Controllers/UIEvents/JoinMUCUIEvent.h>
+
+#include <SwifTools/TabComplete.h>
+
+#include <Swift/QtUI/Roster/QtOccupantListWidget.h>
+#include <Swift/QtUI/QtSettingsProvider.h>
+#include <Swift/QtUI/QtScaledAvatarCache.h>
+#include <Swift/QtUI/QtTextEdit.h>
+#include <Swift/QtUI/QtUISettingConstants.h>
+#include <Swift/QtUI/QtUtilities.h>
+#include <Swift/QtUI/QtWebKitChatView.h>
+
namespace Swift {
QtChatWindow::QtChatWindow(const QString &contact, QtChatTheme* theme, UIEventStream* eventStream, SettingsProvider* settings) : QtTabbable(), contact_(contact), eventStream_(eventStream), blockingState_(BlockingUnsupported), isMUC_(false), supportsImpromptuChat_(false) {