Commit 9134c3b4 authored by Bartosz Brachaczek's avatar Bartosz Brachaczek

qt5: Update includes

I just wanted to temporarily have all includes explicit in the Qt 5
port, so that figuring out where QtWidgets is used for the needs of
Sailfish port is easy. We will need to properly re-evaluate when merging
Qt 5 port to master.
Signed-off-by: 's avatarBartosz Brachaczek <b.brachaczek@gmail.com>
parent 6e20fae4
......@@ -26,7 +26,7 @@
#ifndef ACCOUNTS_PROXY_MODEL_H
#define ACCOUNTS_PROXY_MODEL_H
#include <QtGui/QSortFilterProxyModel>
#include <QtCore/QSortFilterProxyModel>
class AbstractAccountFilter;
......
#include <QtGui/QWidget>
#include <QtWidgets/QWidget>
#include "activate.h"
......
......@@ -25,12 +25,12 @@
#include <QtCore/QCoreApplication>
#include <QtCore/QDir>
#include <QtGui/QCheckBox>
#include <QtGui/QComboBox>
#include <QtGui/QHBoxLayout>
#include <QtGui/QLabel>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QHBoxLayout>
#include <QtWidgets/QLabel>
#include <QtGui/QPalette>
#include <QtGui/QPushButton>
#include <QtWidgets/QPushButton>
#include "accounts/account-manager.h"
#include "buddies/buddy-preferred-manager.h"
......
......@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QtWebKit/QWebFrame>
#include <QtWebKit/QWebPage>
#include <QtWebKitWidgets/QWebFrame>
#include <QtWebKitWidgets/QWebPage>
#include "chat/chat-styles-manager.h"
#include "chat/style-engines/chat-style-engine.h"
......
......@@ -20,7 +20,7 @@
#include <QtCore/QDateTime>
#include <QtCore/QLocale>
#include <QtCore/QString>
#include <QtGui/QApplication>
#include <QtWidgets/QApplication>
#include "os/generic/system-info.h"
......
......@@ -25,7 +25,7 @@
#include <QtCore/QDateTime>
#include <QtCore/QDir>
#include <QtCore/QString>
#include <QtWebKit/QWebFrame>
#include <QtWebKitWidgets/QWebFrame>
#include "accounts/account-manager.h"
#include "accounts/account.h"
......
......@@ -21,7 +21,7 @@
*/
#include <QtCore/QFileInfo>
#include <QtWebKit/QWebFrame>
#include <QtWebKitWidgets/QWebFrame>
#include "accounts/account-manager.h"
#include "buddies/buddy-manager.h"
......
......@@ -34,7 +34,7 @@
#include <QtCore/QMutexLocker>
#include <QtCore/QTextCodec>
#include <QtCore/QTextStream>
#include <QtGui/QApplication>
#include <QtWidgets/QApplication>
#include "configuration/xml-configuration-file.h"
#include "misc/misc.h"
......
......@@ -23,7 +23,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QtGui/QApplication>
#include <QtWidgets/QApplication>
#include "configuration/toolbar-configuration-manager.h"
#include "configuration/xml-configuration-file.h"
......
......@@ -32,7 +32,7 @@
#include <QtCore/QLocale>
#include <QtCore/QSettings>
#include <QtCore/QTimer>
#include <QtGui/QApplication>
#include <QtWidgets/QApplication>
#include <QtCrypto>
......
......@@ -21,7 +21,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QtGui/QFileDialog>
#include <QtWidgets/QFileDialog>
#include "configuration/configuration-file.h"
#include "contacts/contact-set.h"
......
......@@ -25,7 +25,7 @@
#ifndef FILE_TRANSFER_ACTIONS_H
#define FILE_TRANSFER_ACTIONS_H
#include <QtGui/QAction>
#include <QtWidgets/QAction>
class Action;
class ActionDescription;
......
......@@ -24,8 +24,8 @@
*/
#include <QtCore/QFileInfo>
#include <QtGui/QFileDialog>
#include <QtGui/QMessageBox>
#include <QtWidgets/QFileDialog>
#include <QtWidgets/QMessageBox>
#include "accounts/account.h"
#include "chat/chat-manager.h"
......
......@@ -24,7 +24,7 @@
#include <QtCore/QMap>
#include <QtCore/QObject>
#include <QtGui/QToolButton>
#include <QtWidgets/QToolButton>
#include "configuration/configuration-aware-object.h"
#include "icons/kadu-icon.h"
......
......@@ -21,7 +21,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QtGui/QMenu>
#include <QtWidgets/QMenu>
#include "accounts/account-manager.h"
#include "buddies/buddy-set.h"
......
......@@ -24,7 +24,7 @@
#define ACTION_H
#include <QtCore/QMultiMap>
#include <QtGui/QAction>
#include <QtWidgets/QAction>
#include "configuration/configuration-aware-object.h"
#include "icons/kadu-icon.h"
......
......@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QtGui/QAction>
#include <QtGui/QMenu>
#include <QtWidgets/QAction>
#include <QtWidgets/QMenu>
#include "gui/actions/action-context.h"
#include "gui/actions/action.h"
......
......@@ -22,7 +22,7 @@
#ifndef CHANGE_STATUS_ACTION_H
#define CHANGE_STATUS_ACTION_H
#include <QtGui/QAction>
#include <QtWidgets/QAction>
#include "gui/actions/action-description.h"
......
......@@ -23,7 +23,7 @@
#ifndef ADD_CONFERENCE_ACTION_H
#define ADD_CONFERENCE_ACTION_H
#include <QtGui/QAction>
#include <QtWidgets/QAction>
#include "gui/actions/action-description.h"
......
......@@ -23,7 +23,7 @@
#ifndef ADD_ROOM_CHAT_ACTION_H
#define ADD_ROOM_CHAT_ACTION_H
#include <QtGui/QAction>
#include <QtWidgets/QAction>
#include "gui/actions/action-description.h"
......
......@@ -26,7 +26,7 @@
#ifndef LEAVE_CHAT_ACTION_H
#define LEAVE_CHAT_ACTION_H
#include <QtGui/QAction>
#include <QtWidgets/QAction>
#include "gui/actions/action-description.h"
......
......@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QtGui/QAction>
#include <QtGui/QMenu>
#include <QtWidgets/QAction>
#include <QtWidgets/QMenu>
#include "gui/actions/action.h"
#include "gui/windows/proxy-edit-window.h"
......
......@@ -22,7 +22,7 @@
#ifndef DEFAULT_PROXY_ACTION_H
#define DEFAULT_PROXY_ACTION_H
#include <QtGui/QAction>
#include <QtWidgets/QAction>
#include "gui/actions/action-description.h"
......
......@@ -19,7 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QtGui/QApplication>
#include <QtWidgets/QApplication>
#include "buddies/buddy-set.h"
#include "chat/chat.h"
......
......@@ -26,7 +26,7 @@
#ifndef DELETE_TALKABLE_ACTION_H
#define DELETE_TALKABLE_ACTION_H
#include <QtGui/QAction>
#include <QtWidgets/QAction>
#include "model/roles.h"
......
......@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QtGui/QApplication>
#include <QtWidgets/QApplication>
#include "buddies/buddy-set.h"
#include "chat/chat.h"
......
......@@ -26,7 +26,7 @@
#ifndef EDIT_TALKABLE_ACTION_H
#define EDIT_TALKABLE_ACTION_H
#include <QtGui/QAction>
#include <QtWidgets/QAction>
#include "model/roles.h"
......
......@@ -19,7 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QtGui/QMenu>
#include <QtWidgets/QMenu>
#include "accounts/account-manager.h"
#include "accounts/account.h"
......
......@@ -24,7 +24,7 @@
#include <QtCore/QList>
#include <QtCore/QMap>
#include <QtGui/QMenu>
#include <QtWidgets/QMenu>
#include "exports.h"
......
......@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QtGui/QMenu>
#include <QtWidgets/QMenu>
#include "accounts/account.h"
#include "contacts/contact-set.h"
......
......@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QtGui/QApplication>
#include <QtGui/QCheckBox>
#include <QtWidgets/QApplication>
#include <QtWidgets/QCheckBox>
#include "checkbox-styled-item-delegate.h"
......
......@@ -20,7 +20,7 @@
#ifndef CHECKBOX_STYLED_ITEM_DELETAGE_H
#define CHECKBOX_STYLED_ITEM_DELETAGE_H
#include <QtGui/QStyledItemDelegate>
#include <QtWidgets/QStyledItemDelegate>
/**
* @addtogroup Gui
......
......@@ -23,7 +23,7 @@
#ifndef STATUS_ICON_H
#define STATUS_ICON_H
#include <QtGui/QPushButton>
#include <QtWidgets/QPushButton>
#include "configuration/configuration-aware-object.h"
#include "icons/kadu-icon.h"
......
......@@ -19,7 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QtWebKit/QWebFrame>
#include <QtWebKitWidgets/QWebFrame>
#include "gui/widgets/chat-messages-view.h"
......
......@@ -25,7 +25,7 @@
#ifndef ACCOUNT_ADD_WIDGET_H
#define ACCOUNT_ADD_WIDGET_H
#include <QtGui/QWidget>
#include <QtWidgets/QWidget>
#include "accounts/account.h"
#include "gui/widgets/modal-configuration-widget.h"
......
......@@ -19,11 +19,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QtGui/QFileDialog>
#include <QtGui/QLabel>
#include <QtWidgets/QFileDialog>
#include <QtWidgets/QLabel>
#include <QtGui/QMovie>
#include <QtGui/QPushButton>
#include <QtGui/QVBoxLayout>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QVBoxLayout>
#include "avatars/avatar-manager.h"
#include "avatars/avatar.h"
......
......@@ -27,7 +27,7 @@
#ifndef ACCOUNT_AVATAR_WIDGET_H
#define ACCOUNT_AVATAR_WIDGET_H
#include <QtGui/QWidget>
#include <QtWidgets/QWidget>
#include "accounts/account.h"
#include "exports.h"
......
......@@ -22,9 +22,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QtGui/QFileDialog>
#include <QtGui/QHBoxLayout>
#include <QtGui/QVBoxLayout>
#include <QtWidgets/QFileDialog>
#include <QtWidgets/QHBoxLayout>
#include <QtWidgets/QVBoxLayout>
#include "buddies/buddy-manager.h"
#include "buddies/model/buddy-list-model.h"
......
......@@ -27,8 +27,8 @@
#ifndef ACCOUNT_BUDDY_LIST_WIDGET_H
#define ACCOUNT_BUDDY_LIST_WIDGET_H
#include <QtGui/QPushButton>
#include <QtGui/QWidget>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QWidget>
#include "accounts/account.h"
#include "buddies/buddy-list.h"
......
......@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QtGui/QTabWidget>
#include <QtWidgets/QTabWidget>
#include "gui/widgets/account-edit-widget.h"
......
......@@ -24,7 +24,7 @@
#ifndef ACCOUNT_EDIT_WIDGET_H
#define ACCOUNT_EDIT_WIDGET_H
#include <QtGui/QWidget>
#include <QtWidgets/QWidget>
#include "accounts/account.h"
#include "gui/widgets/account-configuration-widget.h"
......
......@@ -19,7 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QtGui/QAction>
#include <QtWidgets/QAction>
#include "accounts/filter/abstract-account-filter.h"
#include "accounts/model/accounts-model.h"
......
......@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QtGui/QAction>
#include <QtWidgets/QAction>
#include "model/action-filter-proxy-model.h"
#include "model/action-list-model.h"
......
......@@ -22,7 +22,7 @@
#ifndef ACTIONS_COMBO_BOX_H
#define ACTIONS_COMBO_BOX_H
#include <QtGui/QComboBox>
#include <QtWidgets/QComboBox>
#include "exports.h"
......
......@@ -25,7 +25,7 @@
#include <QtGui/QPainter>
#include <QtGui/QPixmap>
#include <QtGui/QPixmapCache>
#include <QtGui/QStyleOptionViewItem>
#include <QtWidgets/QStyleOptionViewItem>
#include "contacts/contact.h"
#include "gui/widgets/talkable-delegate-configuration.h"
......
......@@ -25,7 +25,7 @@
#include <QtCore/QString>
#include <QtGui/QPixmap>
#include <QtGui/QStyleOptionViewItemV4>
#include <QtWidgets/QStyleOptionViewItemV4>
class QModelIndex;
......
......@@ -21,11 +21,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QtGui/QFileDialog>
#include <QtWidgets/QFileDialog>
#include <QtGui/QImageReader>
#include <QtGui/QLabel>
#include <QtGui/QPushButton>
#include <QtGui/QVBoxLayout>
#include <QtWidgets/QLabel>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QVBoxLayout>
#include "avatars/avatar.h"
#include "buddies/buddy-preferred-manager.h"
......
......@@ -25,7 +25,7 @@
#ifndef BUDDY_AVATAR_WIDGET_H
#define BUDDY_AVATAR_WIDGET_H
#include <QtGui/QWidget>
#include <QtWidgets/QWidget>
#include "buddies/buddy.h"
......
......@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/