diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-07 22:20:17 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-07 22:22:31 +0200 |
commit | 3d30c0fb60fd43cfdc3fdd4ffb839f1e863ccef6 (patch) | |
tree | 4078508400a0138cc16c4746289b3c996037f6cb /src/widgets/styles | |
parent | b597565788ae430ed26201fc050685cc81050d93 (diff) |
fix remaining includes
Made easy thanks to the fixqt4includes
script
Diffstat (limited to 'src/widgets/styles')
-rw-r--r-- | src/widgets/styles/qgtkpainter.cpp | 4 | ||||
-rw-r--r-- | src/widgets/styles/qgtkpainter_p.h | 2 | ||||
-rw-r--r-- | src/widgets/styles/qgtkstyle.cpp | 44 | ||||
-rw-r--r-- | src/widgets/styles/qgtkstyle.h | 4 | ||||
-rw-r--r-- | src/widgets/styles/qgtkstyle_p.cpp | 16 | ||||
-rw-r--r-- | src/widgets/styles/qgtkstyle_p.h | 4 |
6 files changed, 37 insertions, 37 deletions
diff --git a/src/widgets/styles/qgtkpainter.cpp b/src/widgets/styles/qgtkpainter.cpp index 68ade04984..0d86540974 100644 --- a/src/widgets/styles/qgtkpainter.cpp +++ b/src/widgets/styles/qgtkpainter.cpp @@ -48,8 +48,8 @@ // and takes care of converting all such calls into cached Qt pixmaps. #include <private/qstylehelper_p.h> -#include <QtGui/QWidget> -#include <QtGui/QStyleOption> +#include <QtWidgets/QWidget> +#include <QtWidgets/QStyleOption> #include <QtGui/QPixmapCache> QT_BEGIN_NAMESPACE diff --git a/src/widgets/styles/qgtkpainter_p.h b/src/widgets/styles/qgtkpainter_p.h index 1c253798a8..121466622b 100644 --- a/src/widgets/styles/qgtkpainter_p.h +++ b/src/widgets/styles/qgtkpainter_p.h @@ -56,7 +56,7 @@ #include <QtCore/qglobal.h> #if !defined(QT_NO_STYLE_GTK) -#include <QtGui/QCleanlooksStyle> +#include <QtWidgets/QCleanlooksStyle> #include <QtGui/QPainter> #include <QtGui/QPalette> #include <QtGui/QFont> diff --git a/src/widgets/styles/qgtkstyle.cpp b/src/widgets/styles/qgtkstyle.cpp index 277e3025b5..047eb97195 100644 --- a/src/widgets/styles/qgtkstyle.cpp +++ b/src/widgets/styles/qgtkstyle.cpp @@ -45,29 +45,29 @@ #include <private/qapplication_p.h> #include <QtCore/QLibrary> #include <QtCore/QSettings> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QStatusBar> -#include <QtGui/QLineEdit> -#include <QtGui/QWidget> -#include <QtGui/QListView> -#include <QtGui/QApplication> -#include <QtGui/QStyleOption> -#include <QtGui/QPushButton> +#include <QtWidgets/QDialogButtonBox> +#include <QtWidgets/QStatusBar> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QWidget> +#include <QtWidgets/QListView> +#include <QtWidgets/QApplication> +#include <QtWidgets/QStyleOption> +#include <QtWidgets/QPushButton> #include <QtGui/QPainter> -#include <QtGui/QMainWindow> -#include <QtGui/QToolBar> -#include <QtGui/QHeaderView> -#include <QtGui/QMenuBar> -#include <QtGui/QComboBox> -#include <QtGui/QSpinBox> -#include <QtGui/QScrollBar> -#include <QtGui/QAbstractButton> -#include <QtGui/QToolButton> -#include <QtGui/QGroupBox> -#include <QtGui/QRadioButton> -#include <QtGui/QCheckBox> -#include <QtGui/QTreeView> -#include <QtGui/QStyledItemDelegate> +#include <QtWidgets/QMainWindow> +#include <QtWidgets/QToolBar> +#include <QtWidgets/QHeaderView> +#include <QtWidgets/QMenuBar> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QSpinBox> +#include <QtWidgets/QScrollBar> +#include <QtWidgets/QAbstractButton> +#include <QtWidgets/QToolButton> +#include <QtWidgets/QGroupBox> +#include <QtWidgets/QRadioButton> +#include <QtWidgets/QCheckBox> +#include <QtWidgets/QTreeView> +#include <QtWidgets/QStyledItemDelegate> #include <qpixmapcache.h> #undef signals // Collides with GTK stymbols #include <private/qgtkpainter_p.h> diff --git a/src/widgets/styles/qgtkstyle.h b/src/widgets/styles/qgtkstyle.h index 616ce24509..abf8ed4fbd 100644 --- a/src/widgets/styles/qgtkstyle.h +++ b/src/widgets/styles/qgtkstyle.h @@ -42,10 +42,10 @@ #ifndef QGTKSTYLE_H #define QGTKSTYLE_H -#include <QtGui/QCleanlooksStyle> +#include <QtWidgets/QCleanlooksStyle> #include <QtGui/QPalette> #include <QtGui/QFont> -#include <QtGui/QFileDialog> +#include <QtWidgets/QFileDialog> QT_BEGIN_HEADER diff --git a/src/widgets/styles/qgtkstyle_p.cpp b/src/widgets/styles/qgtkstyle_p.cpp index d7c53c9a91..e0ebf51c5b 100644 --- a/src/widgets/styles/qgtkstyle_p.cpp +++ b/src/widgets/styles/qgtkstyle_p.cpp @@ -65,15 +65,15 @@ #include <private/qapplication_p.h> #include <private/qiconloader_p.h> -#include <QtGui/QMenu> -#include <QtGui/QStyle> -#include <QtGui/QApplication> +#include <QtWidgets/QMenu> +#include <QtWidgets/QStyle> +#include <QtWidgets/QApplication> #include <QtGui/QPixmapCache> -#include <QtGui/QStatusBar> -#include <QtGui/QMenuBar> -#include <QtGui/QToolBar> -#include <QtGui/QToolButton> -#include <QtGui/QX11Info> +#include <QtWidgets/QStatusBar> +#include <QtWidgets/QMenuBar> +#include <QtWidgets/QToolBar> +#include <QtWidgets/QToolButton> +#include <QtWidgets/QX11Info> #include <private/qt_x11_p.h> diff --git a/src/widgets/styles/qgtkstyle_p.h b/src/widgets/styles/qgtkstyle_p.h index 15a98c8257..8c84eb3b9d 100644 --- a/src/widgets/styles/qgtkstyle_p.h +++ b/src/widgets/styles/qgtkstyle_p.h @@ -60,9 +60,9 @@ #include <QtCore/qstringbuilder.h> #include <QtCore/qcoreapplication.h> -#include <QtGui/QFileDialog> +#include <QtWidgets/QFileDialog> -#include <QtGui/QGtkStyle> +#include <QtWidgets/QGtkStyle> #include <private/qcleanlooksstyle_p.h> #undef signals // Collides with GTK stymbols |