Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-03-29 17:27:10 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-03-30 11:24:00 (GMT) |
| commit | 5de19b60ae5593adbc3d913f9c64162e21bc702a (patch) | |
| tree | 07d3e7a9e6105609858931154ee7fbfc599bd34a /Swift/QtUI/UserSearch | |
| parent | 74e51310d27e9d9a66d2d790360549c48abec8d1 (diff) | |
| download | swift-5de19b60ae5593adbc3d913f9c64162e21bc702a.zip swift-5de19b60ae5593adbc3d913f9c64162e21bc702a.tar.bz2 | |
Apply consistent #include grouping and sorting style
Changed "" style includes to <> style.
Test-Information:
Build with Clang 3.9.0 and ran all tests on OS X 10.11.4.
Change-Id: Ic05e53f2e5dba39cc1307b116fc5f17b62ab9eb8
Diffstat (limited to 'Swift/QtUI/UserSearch')
20 files changed, 74 insertions, 61 deletions
diff --git a/Swift/QtUI/UserSearch/ContactListDelegate.cpp b/Swift/QtUI/UserSearch/ContactListDelegate.cpp index 19290aa..989743e 100644 --- a/Swift/QtUI/UserSearch/ContactListDelegate.cpp +++ b/Swift/QtUI/UserSearch/ContactListDelegate.cpp @@ -5,15 +5,17 @@ */ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swift/QtUI/UserSearch/ContactListDelegate.h> -#include <Swift/QtUI/UserSearch/ContactListModel.h> + #include <Swift/Controllers/Contact.h> + #include <Swift/QtUI/QtSwiftUtil.h> +#include <Swift/QtUI/UserSearch/ContactListModel.h> namespace Swift { diff --git a/Swift/QtUI/UserSearch/ContactListModel.cpp b/Swift/QtUI/UserSearch/ContactListModel.cpp index db13fbc..3400924 100644 --- a/Swift/QtUI/UserSearch/ContactListModel.cpp +++ b/Swift/QtUI/UserSearch/ContactListModel.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -18,8 +18,8 @@ #include <Swiften/Base/foreach.h> #include <Swiften/Elements/StatusShow.h> -#include <Swift/QtUI/QtSwiftUtil.h> #include <Swift/QtUI/QtResourceHelper.h> +#include <Swift/QtUI/QtSwiftUtil.h> namespace Swift { diff --git a/Swift/QtUI/UserSearch/ContactListModel.h b/Swift/QtUI/UserSearch/ContactListModel.h index 51a4bd1..e980120 100644 --- a/Swift/QtUI/UserSearch/ContactListModel.h +++ b/Swift/QtUI/UserSearch/ContactListModel.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -13,14 +13,17 @@ #pragma once #include <vector> + #include <boost/bind.hpp> -#include <Swiften/Base/boost_bsignals.h> #include <QAbstractItemModel> +#include <Swiften/Base/boost_bsignals.h> + #include <Swift/Controllers/Contact.h> -#include <Swift/QtUI/ChatList/ChatListItem.h> + #include <Swift/QtUI/ChatList/ChatListGroupItem.h> +#include <Swift/QtUI/ChatList/ChatListItem.h> #include <Swift/QtUI/ChatList/ChatListRecentItem.h> namespace Swift { diff --git a/Swift/QtUI/UserSearch/QtContactListWidget.cpp b/Swift/QtUI/UserSearch/QtContactListWidget.cpp index 9b76aba..0d55880 100644 --- a/Swift/QtUI/UserSearch/QtContactListWidget.cpp +++ b/Swift/QtUI/UserSearch/QtContactListWidget.cpp @@ -5,20 +5,21 @@ */ /* - * Copyright (c) 2014-2015 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swift/QtUI/UserSearch/QtContactListWidget.h> -#include <Swift/QtUI/UserSearch/ContactListModel.h> -#include <Swift/QtUI/UserSearch/ContactListDelegate.h> -#include <Swift/QtUI/QtUISettingConstants.h> +#include <QHeaderView> + #include <Swift/Controllers/Settings/SettingsProvider.h> -#include <Swift/QtUI/QtVCardWidget/QtRemovableItemDelegate.h> -#include <QHeaderView> +#include <Swift/QtUI/QtUISettingConstants.h> +#include <Swift/QtUI/QtVCardWidget/QtRemovableItemDelegate.h> +#include <Swift/QtUI/UserSearch/ContactListDelegate.h> +#include <Swift/QtUI/UserSearch/ContactListModel.h> namespace Swift { diff --git a/Swift/QtUI/UserSearch/QtContactListWidget.h b/Swift/QtUI/UserSearch/QtContactListWidget.h index 43da011..59bd8f3 100644 --- a/Swift/QtUI/UserSearch/QtContactListWidget.h +++ b/Swift/QtUI/UserSearch/QtContactListWidget.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -14,14 +14,14 @@ #include <vector> +#include <QDragEnterEvent> +#include <QDragMoveEvent> +#include <QDropEvent> #include <QTreeView> -#include <Swift/Controllers/Contact.h> #include <Swiften/Base/Log.h> -#include <QDragEnterEvent> -#include <QDragMoveEvent> -#include <QDropEvent> +#include <Swift/Controllers/Contact.h> namespace Swift { diff --git a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp index 8ed6efb..26d0f05 100644 --- a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp +++ b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp @@ -5,27 +5,28 @@ */ /* - * Copyright (c) 2014-2015 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swift/QtUI/UserSearch/QtSuggestingJIDInput.h> -#include <Swift/QtUI/UserSearch/ContactListDelegate.h> -#include <Swift/Controllers/Settings/SettingsProvider.h> -#include <Swift/QtUI/QtUISettingConstants.h> -#include <Swift/QtUI/UserSearch/ContactListModel.h> -#include <Swiften/Base/boost_bsignals.h> #include <boost/bind.hpp> -#include <Swift/QtUI/QtSwiftUtil.h> - #include <QAbstractItemView> #include <QApplication> #include <QDesktopWidget> #include <QKeyEvent> +#include <Swiften/Base/boost_bsignals.h> + +#include <Swift/Controllers/Settings/SettingsProvider.h> + +#include <Swift/QtUI/QtSwiftUtil.h> +#include <Swift/QtUI/QtUISettingConstants.h> +#include <Swift/QtUI/UserSearch/ContactListDelegate.h> +#include <Swift/QtUI/UserSearch/ContactListModel.h> namespace Swift { diff --git a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.h b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.h index d5ec45d..73840b4 100644 --- a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.h +++ b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2014-2015 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -14,7 +14,9 @@ #include <QLineEdit> #include <QTreeView> + #include <Swiften/Base/boost_bsignals.h> + #include <Swift/Controllers/Contact.h> namespace Swift { diff --git a/Swift/QtUI/UserSearch/QtUserSearchDetailsPage.cpp b/Swift/QtUI/UserSearch/QtUserSearchDetailsPage.cpp index a6c1e24..4e8354f 100644 --- a/Swift/QtUI/UserSearch/QtUserSearchDetailsPage.cpp +++ b/Swift/QtUI/UserSearch/QtUserSearchDetailsPage.cpp @@ -1,16 +1,16 @@ /* - * Copyright (c) 2011-2014 Isode Limited. + * Copyright (c) 2011-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ -#include "Swift/QtUI/UserSearch/QtUserSearchDetailsPage.h" - -#include <QVBoxLayout> -#include <QLabel> +#include <Swift/QtUI/UserSearch/QtUserSearchDetailsPage.h> #include <boost/bind.hpp> +#include <QLabel> +#include <QVBoxLayout> + #include <Swiften/Base/boost_bsignals.h> #include <Swiften/JID/JID.h> diff --git a/Swift/QtUI/UserSearch/QtUserSearchDetailsPage.h b/Swift/QtUI/UserSearch/QtUserSearchDetailsPage.h index eefa630..568dfe3 100644 --- a/Swift/QtUI/UserSearch/QtUserSearchDetailsPage.h +++ b/Swift/QtUI/UserSearch/QtUserSearchDetailsPage.h @@ -1,19 +1,20 @@ /* - * Copyright (c) 2011 Isode Limited. + * Copyright (c) 2011-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <QWizardPage> - #include <set> #include <string> #include <vector> +#include <QWizardPage> + #include <Swiften/Elements/VCard.h> #include <Swiften/JID/JID.h> + #include <Swift/QtUI/UserSearch/ui_QtUserSearchFieldsPage.h> namespace Swift { diff --git a/Swift/QtUI/UserSearch/QtUserSearchFieldsPage.cpp b/Swift/QtUI/UserSearch/QtUserSearchFieldsPage.cpp index 13b61a7..9b02273 100644 --- a/Swift/QtUI/UserSearch/QtUserSearchFieldsPage.cpp +++ b/Swift/QtUI/UserSearch/QtUserSearchFieldsPage.cpp @@ -1,10 +1,10 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ -#include "Swift/QtUI/UserSearch/QtUserSearchFieldsPage.h" +#include <Swift/QtUI/UserSearch/QtUserSearchFieldsPage.h> namespace Swift { diff --git a/Swift/QtUI/UserSearch/QtUserSearchFieldsPage.h b/Swift/QtUI/UserSearch/QtUserSearchFieldsPage.h index 70618f9..29ff675 100644 --- a/Swift/QtUI/UserSearch/QtUserSearchFieldsPage.h +++ b/Swift/QtUI/UserSearch/QtUserSearchFieldsPage.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -9,7 +9,6 @@ #include <QWizardPage> #include <Swift/QtUI/QtFormWidget.h> - #include <Swift/QtUI/UserSearch/ui_QtUserSearchFieldsPage.h> namespace Swift { diff --git a/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp b/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp index 9abdcf0..40ea1c0 100644 --- a/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp +++ b/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp @@ -5,19 +5,20 @@ */ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ -#include "Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.h" +#include <Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.h> #include <QMessageBox> #include <QMimeData> #include <QUrl> -#include "Swift/QtUI/QtSwiftUtil.h" #include <Swift/Controllers/Settings/SettingsProvider.h> + +#include <Swift/QtUI/QtSwiftUtil.h> #include <Swift/QtUI/UserSearch/QtContactListWidget.h> #include <Swift/QtUI/UserSearch/QtSuggestingJIDInput.h> diff --git a/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.h b/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.h index 8cc6616..82b8f93 100644 --- a/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.h +++ b/Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -14,9 +14,10 @@ #include <QWizardPage> -#include <Swift/QtUI/UserSearch/ui_QtUserSearchFirstMultiJIDPage.h> #include <Swift/Controllers/UIInterfaces/UserSearchWindow.h> +#include <Swift/QtUI/UserSearch/ui_QtUserSearchFirstMultiJIDPage.h> + namespace Swift { class UserSearchModel; class UserSearchDelegate; diff --git a/Swift/QtUI/UserSearch/QtUserSearchFirstPage.cpp b/Swift/QtUI/UserSearch/QtUserSearchFirstPage.cpp index 6e8744f..93157c7 100644 --- a/Swift/QtUI/UserSearch/QtUserSearchFirstPage.cpp +++ b/Swift/QtUI/UserSearch/QtUserSearchFirstPage.cpp @@ -1,15 +1,15 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ -#include "Swift/QtUI/UserSearch/QtUserSearchFirstPage.h" - -#include "Swift/QtUI/QtSwiftUtil.h" +#include <Swift/QtUI/UserSearch/QtUserSearchFirstPage.h> #include <Swiften/Base/Log.h> +#include <Swift/QtUI/QtSwiftUtil.h> + namespace Swift { QtUserSearchFirstPage::QtUserSearchFirstPage(UserSearchWindow::Type type, const QString& title, SettingsProvider* settings) { diff --git a/Swift/QtUI/UserSearch/QtUserSearchFirstPage.h b/Swift/QtUI/UserSearch/QtUserSearchFirstPage.h index 4bc3923..9e765a0 100644 --- a/Swift/QtUI/UserSearch/QtUserSearchFirstPage.h +++ b/Swift/QtUI/UserSearch/QtUserSearchFirstPage.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -8,10 +8,10 @@ #include <QWizardPage> -#include <Swift/QtUI/UserSearch/ui_QtUserSearchFirstPage.h> #include <Swift/Controllers/UIInterfaces/UserSearchWindow.h> #include <Swift/QtUI/UserSearch/QtSuggestingJIDInput.h> +#include <Swift/QtUI/UserSearch/ui_QtUserSearchFirstPage.h> namespace Swift { class UserSearchModel; diff --git a/Swift/QtUI/UserSearch/QtUserSearchResultsPage.cpp b/Swift/QtUI/UserSearch/QtUserSearchResultsPage.cpp index 39ef3e7..6ec4a34 100644 --- a/Swift/QtUI/UserSearch/QtUserSearchResultsPage.cpp +++ b/Swift/QtUI/UserSearch/QtUserSearchResultsPage.cpp @@ -1,10 +1,10 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ -#include "Swift/QtUI/UserSearch/QtUserSearchResultsPage.h" +#include <Swift/QtUI/UserSearch/QtUserSearchResultsPage.h> namespace Swift { diff --git a/Swift/QtUI/UserSearch/QtUserSearchResultsPage.h b/Swift/QtUI/UserSearch/QtUserSearchResultsPage.h index 60be555..d2ee566 100644 --- a/Swift/QtUI/UserSearch/QtUserSearchResultsPage.h +++ b/Swift/QtUI/UserSearch/QtUserSearchResultsPage.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.h b/Swift/QtUI/UserSearch/QtUserSearchWindow.h index 15e68bf..81d6e85 100644 --- a/Swift/QtUI/UserSearch/QtUserSearchWindow.h +++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.h @@ -1,17 +1,19 @@ /* - * Copyright (c) 2010-2014 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <QWizard> #include <set> -#include <Swift/QtUI/UserSearch/ui_QtUserSearchWizard.h> +#include <QWizard> + #include <Swift/Controllers/UIInterfaces/UserSearchWindow.h> +#include <Swift/QtUI/UserSearch/ui_QtUserSearchWizard.h> + namespace Swift { class UserSearchModel; class UserSearchDelegate; diff --git a/Swift/QtUI/UserSearch/UserSearchModel.cpp b/Swift/QtUI/UserSearch/UserSearchModel.cpp index c758492..ba6ede3 100644 --- a/Swift/QtUI/UserSearch/UserSearchModel.cpp +++ b/Swift/QtUI/UserSearch/UserSearchModel.cpp @@ -1,12 +1,12 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ -#include "Swift/QtUI/UserSearch/UserSearchModel.h" +#include <Swift/QtUI/UserSearch/UserSearchModel.h> -#include "Swift/QtUI/QtSwiftUtil.h" +#include <Swift/QtUI/QtSwiftUtil.h> namespace Swift { diff --git a/Swift/QtUI/UserSearch/UserSearchModel.h b/Swift/QtUI/UserSearch/UserSearchModel.h index 5048100..db3ef3a 100644 --- a/Swift/QtUI/UserSearch/UserSearchModel.h +++ b/Swift/QtUI/UserSearch/UserSearchModel.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -11,7 +11,7 @@ #include <QAbstractItemModel> #include <QList> -#include "Swift/Controllers/Chat/UserSearchController.h" +#include <Swift/Controllers/Chat/UserSearchController.h> namespace Swift { class UserSearchModel : public QAbstractItemModel { |