alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't use the QtGui module name in includes.

Browse Source 
In Qt5, many of them are moved to QtWidgets, so this is the only
way to be source compatible with both Qt 4 and Qt 5.
This commit is contained in:
Stephen Kelly 2012-02-02 10:35:53 +01:00
parent a57081af2c
commit b1b68adb7d
61 changed files with 120 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
animations/animation.h
View File

@ -25,7 +25,7 @@
#ifndef PLASMA_ANIMATION_H
#define PLASMA_ANIMATION_H
#include <QtGui/QGraphicsWidget>
#include <QGraphicsWidget>
#include <QtCore/QObject>
#include <QtCore/QPropertyAnimation>
#include <QtCore/QAbstractAnimation>

2
animator.h
View File

@ -21,7 +21,7 @@
#ifndef PLASMA_ANIMATOR_H
#define PLASMA_ANIMATOR_H
#include <QtGui/QImage>
#include <QImage>
#include <QtCore/QObject>
#include <QtCore/QAbstractAnimation>
#include <QtCore/QEasingCurve>

6
applet.h
View File

@ -22,9 +22,9 @@
#ifndef PLASMA_APPLET_H
#define PLASMA_APPLET_H
#include <QtGui/QGraphicsItem>
#include <QtGui/QGraphicsWidget>
#include <QtGui/QIcon>
#include <QGraphicsItem>
#include <QGraphicsWidget>
#include <QIcon>
#include <kconfiggroup.h>
#include <kgenericfactory.h>

6
containment.h
View File

@ -22,9 +22,9 @@
#ifndef PLASMA_CONTAINMENT_H
#define PLASMA_CONTAINMENT_H
#include <QtGui/QGraphicsItem>
#include <QtGui/QWidget>
#include <QtGui/QStyleOptionGraphicsItem>
#include <QGraphicsItem>
#include <QWidget>
#include <QStyleOptionGraphicsItem>
#include <kplugininfo.h>
#include <ksharedconfig.h>

2
corona.h
View File

@ -21,7 +21,7 @@
#ifndef PLASMA_CORONA_H
#define PLASMA_CORONA_H
#include <QtGui/QGraphicsScene>
#include <QGraphicsScene>
#include <plasma/containment.h>
#include <plasma/plasma.h>

2
delegate.h
View File

@ -22,7 +22,7 @@
#define PLASMA_DELEGATE_H
// Qt
#include <QtGui/QAbstractItemDelegate>
#include <QAbstractItemDelegate>
// Plasma
#include <plasma/plasma_export.h>

8
dialog.cpp
View File

@ -32,10 +32,10 @@
#endif
#include <QBitmap>
#include <QTimer>
#include <QtGui/QVBoxLayout>
#include <QtGui/QGraphicsSceneEvent>
#include <QtGui/QGraphicsView>
#include <QtGui/QGraphicsWidget>
#include <QVBoxLayout>
#include <QGraphicsSceneEvent>
#include <QGraphicsView>
#include <QGraphicsWidget>
#include <QApplication>
#include <QDesktopWidget>
#include <QVarLengthArray>

6
dialog.h
View File

@ -23,9 +23,9 @@
#ifndef PLASMA_DIALOG_H
#define PLASMA_DIALOG_H
#include <QtGui/QWidget>
#include <QtGui/QGraphicsSceneEvent>
#include <QtGui/QGraphicsView>
#include <QWidget>
#include <QGraphicsSceneEvent>
#include <QGraphicsView>
#include <plasma/plasma_export.h>
#include <plasma/plasma.h>

2
framesvg.h
View File

@ -22,7 +22,7 @@
#define PLASMA_FRAMESVG_H
#include <QtCore/QObject>
#include <QtGui/QPixmap>
#include <QPixmap>
#include <plasma/plasma_export.h>

6
paintutils.h
View File

@ -21,9 +21,9 @@
#ifndef PLASMA_PAINTUTILS_H
#define PLASMA_PAINTUTILS_H
#include <QtGui/QApplication>
#include <QtGui/QGraphicsItem>
#include <QtGui/QPainterPath>
#include <QApplication>
#include <QGraphicsItem>
#include <QPainterPath>
#include <plasma/plasma_export.h>
#include "theme.h"

4
plasma.h
View File

@ -22,8 +22,8 @@
/** @header plasma/plasma.h <Plasma/Plasma> */
#include <QtGui/QGraphicsItem>
#include <QtGui/QPainterPath>
#include <QGraphicsItem>
#include <QPainterPath>
#include <plasma/plasma_export.h>

2
private/animablegraphicswebview.cpp
View File

@ -20,7 +20,7 @@
#include "animablegraphicswebview_p.h"
#include <QtGui/QApplication>
#include <QApplication>
#include <QGestureEvent>
#include <QPinchGesture>
#include <QtWebKit/QWebFrame>

10
private/animablegraphicswebview_p.h
View File

@ -21,11 +21,11 @@
#ifndef ANIMABLEWEBVIEW_P_H
#define ANIMABLEWEBVIEW_P_H
#include <QtGui/QGraphicsSceneContextMenuEvent>
#include <QtGui/QGraphicsSceneDragDropEvent>
#include <QtGui/QGraphicsSceneMouseEvent>
#include <QtGui/QGraphicsSceneWheelEvent>
#include <QtGui/QGraphicsView>
#include <QGraphicsSceneContextMenuEvent>
#include <QGraphicsSceneDragDropEvent>
#include <QGraphicsSceneMouseEvent>
#include <QGraphicsSceneWheelEvent>
#include <QGraphicsView>
#include <config-plasma.h>

10
private/applethandle.cpp
View File

@ -21,11 +21,11 @@
#include <QApplication>
#include <QBitmap>
#include <QtGui/QGraphicsSceneMouseEvent>
#include <QtGui/QLinearGradient>
#include <QtGui/QPainter>
#include <QtGui/QApplication>
#include <QtGui/QMenu>
#include <QGraphicsSceneMouseEvent>
#include <QLinearGradient>
#include <QPainter>
#include <QApplication>
#include <QMenu>
#include <QTouchEvent>
#include <QMatrix>
#include <QTransform>

2
private/applethandle_p.h
View File

@ -21,7 +21,7 @@
#define PLASMA_APPLETHANDLE_P_H
#include <QtCore/QObject>
#include <QtGui/QGraphicsObject>
#include <QGraphicsObject>
#include <QTimer>
#include <QWeakPointer>
#include <QPropertyAnimation>

6
private/qtjolie-branch/tests/calculatorservice.cpp
View File

@ -19,9 +19,9 @@
*/
#include <QtCore/QTimer>
#include <QtGui/QApplication>
#include <QtGui/QBoxLayout>
#include <QtGui/QTextEdit>
#include <QApplication>
#include <QBoxLayout>
#include <QTextEdit>
#include <QtNetwork/QTcpSocket>
#include <QtJolie/AbstractAdaptor>

8
private/qtjolie-branch/tests/testprinter.cpp
View File

@ -19,10 +19,10 @@
*/
#include <QtCore/QBuffer>
#include <QtGui/QApplication>
#include <QtGui/QBoxLayout>
#include <QtGui/QLineEdit>
#include <QtGui/QPushButton>
#include <QApplication>
#include <QBoxLayout>
#include <QLineEdit>
#include <QPushButton>
#include <QtNetwork/QTcpSocket>
#include <QtJolie/Message>

8
private/qtjolie-branch/tests/trivialyahooclient.cpp
View File

@ -22,10 +22,10 @@
#include <QtCore/QDebug>
#include <QtCore/QTimer>
#include <QtGui/QApplication>
#include <QtGui/QBoxLayout>
#include <QtGui/QLineEdit>
#include <QtGui/QTextBrowser>
#include <QApplication>
#include <QBoxLayout>
#include <QLineEdit>
#include <QTextBrowser>
#include <QtJolie/Client>
#include <QtJolie/Message>

8
private/qtjolie-branch/tests/visiondriver.cpp
View File

@ -21,10 +21,10 @@
#include <QtCore/QDebug>
#include <QtCore/QTimer>
#include <QtGui/QApplication>
#include <QtGui/QBoxLayout>
#include <QtGui/QLineEdit>
#include <QtGui/QTextBrowser>
#include <QApplication>
#include <QBoxLayout>
#include <QLineEdit>
#include <QTextBrowser>
#include <QtJolie/AbstractAdaptor>
#include <QtJolie/Client>

2
private/style_p.h
View File

@ -22,7 +22,7 @@
#define PLASMA_STYLE_P_H
#include <QtCore/QSharedData>
#include <QtGui/QCommonStyle>
#include <QCommonStyle>
#include <ksharedptr.h>

2
svg.h
View File

@ -21,7 +21,7 @@
#define PLASMA_SVG_H
#include <QtCore/QObject>
#include <QtGui/QPixmap>
#include <QPixmap>
#include <plasma/plasma_export.h>

18
tests/testengine/testengine.cpp
View File

@ -24,15 +24,15 @@
#include <QtCore/QDate>
#include <QtCore/QLocale>
#include <QtCore/QUrl>
#include <QtGui/QBitmap>
#include <QtGui/QBrush>
#include <QtGui/QCursor>
#include <QtGui/QFont>
#include <QtGui/QIcon>
#include <QtGui/QPalette>
#include <QtGui/QPen>
#include <QtGui/QSizePolicy>
#include <QtGui/QTextFormat>
#include <QBitmap>
#include <QBrush>
#include <QCursor>
#include <QFont>
#include <QIcon>
#include <QPalette>
#include <QPen>
#include <QSizePolicy>
#include <QTextFormat>
Q_DECLARE_METATYPE(TestEngine::MyUserType)

4
theme.h
View File

@ -21,8 +21,8 @@
#define PLASMA_THEME_H
#include <QtCore/QObject>
#include <QtGui/QFont>
#include <QtGui/QFontMetrics>
#include <QFont>
#include <QFontMetrics>
#include <kplugininfo.h>
#include <ksharedconfig.h>

4
tooltipcontent.h
View File

@ -24,8 +24,8 @@
#include <QtCore/QUrl>
#include <QtCore/QVariant>
#include <QtCore/QList>
#include <QtGui/QPixmap>
#include <QtGui/QIcon>
#include <QPixmap>
#include <QIcon>
#include <plasma/plasma_export.h>

2
tooltipmanager.cpp
View File

@ -34,7 +34,7 @@
//X11
#ifdef Q_WS_X11
#include <QtGui/QX11Info>
#include <QX11Info>
#include <X11/Xlib.h>
#include <fixx11h.h>
#endif

4
view.h
View File

@ -20,8 +20,8 @@
#ifndef PLASMA_VIEW_H
#define PLASMA_VIEW_H
#include <QtGui/QApplication>
#include <QtGui/QGraphicsView>
#include <QApplication>
#include <QGraphicsView>
#include <kconfiggroup.h>

2
widgets/busywidget.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_BUSYWIDGET_H
#define PLASMA_BUSYWIDGET_H
#include <QtGui/QGraphicsWidget>
#include <QGraphicsWidget>
#include <plasma/plasma_export.h>

2
widgets/checkbox.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_CHECKBOX_H
#define PLASMA_CHECKBOX_H
#include <QtGui/QGraphicsProxyWidget>
#include <QGraphicsProxyWidget>
#include <plasma/plasma_export.h>

2
widgets/combobox.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_COMBOBOX_H
#define PLASMA_COMBOBOX_H
#include <QtGui/QGraphicsProxyWidget>
#include <QGraphicsProxyWidget>
class KComboBox;

2
widgets/declarativewidget.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_DECLARATIVEWIDGET_H
#define PLASMA_DECLARATIVEWIDGET_H
#include <QtGui/QGraphicsWidget>
#include <QGraphicsWidget>
#include <plasma/plasma_export.h>

6
widgets/flashinglabel.cpp
View File

@ -25,9 +25,9 @@
#include <QtCore/QTimeLine>
#include <QtCore/QTimer>
#include <QtCore/QWeakPointer>
#include <QtGui/QPainter>
#include <QtGui/QPixmap>
#include <QtGui/QColor>
#include <QPainter>
#include <QPixmap>
#include <QColor>
#include <kdebug.h>

4
widgets/flashinglabel.h
View File

@ -21,8 +21,8 @@
#ifndef PLASMA_FLASHINGLABEL_H
#define PLASMA_FLASHINGLABEL_H
#include <QtGui/QGraphicsWidget>
#include <QtGui/QTextOption>
#include <QGraphicsWidget>
#include <QTextOption>
#include <plasma/plasma_export.h>

2
widgets/frame.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_FRAME_H
#define PLASMA_FRAME_H
#include <QtGui/QGraphicsWidget>
#include <QGraphicsWidget>
#include <plasma/plasma_export.h>
#include <plasma/framesvg.h>

2
widgets/groupbox.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_GROUPBOX_H
#define PLASMA_GROUPBOX_H
#include <QtGui/QGraphicsProxyWidget>
#include <QGraphicsProxyWidget>
class QGroupBox;

6
widgets/iconwidget.h
View File

@ -25,9 +25,9 @@
#include <QtCore/QObject>
#include <QtCore/QWeakPointer>
#include <QtGui/QGraphicsTextItem>
#include <QtGui/QIcon>
#include <QtGui/QGraphicsWidget>
#include <QGraphicsTextItem>
#include <QIcon>
#include <QGraphicsWidget>
#include <plasma/dataengine.h>
#include <plasma/animator.h>

10
widgets/iconwidget_p.h
View File

@ -24,11 +24,11 @@
#include <QtCore/QEvent>
#include <QtCore/QWeakPointer>
#include <QtGui/QApplication>
#include <QtGui/QIcon>
#include <QtGui/QStyleOptionGraphicsItem>
#include <QtGui/QTextLayout>
#include <QtGui/QTextOption>
#include <QApplication>
#include <QIcon>
#include <QStyleOptionGraphicsItem>
#include <QTextLayout>
#include <QTextOption>
#include "iconwidget.h"
#include "framesvg.h"

2
widgets/itembackground.h
View File

@ -21,7 +21,7 @@
#ifndef ITEMBACKGROUND_H
#define ITEMBACKGROUND_H
#include <QtGui/QGraphicsWidget>
#include <QGraphicsWidget>
#include <plasma/plasma_export.h>

2
widgets/label.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_LABEL_H
#define PLASMA_LABEL_H
#include <QtGui/QGraphicsProxyWidget>
#include <QGraphicsProxyWidget>
#include <plasma/plasma_export.h>
#include <plasma/dataengine.h>

2
widgets/lineedit.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_LINEEDIT_H
#define PLASMA_LINEEDIT_H
#include <QtGui/QGraphicsProxyWidget>
#include <QGraphicsProxyWidget>
class KLineEdit;

2
widgets/meter.h
View File

@ -22,7 +22,7 @@
#include <plasma/plasma_export.h>
#include <plasma/dataengine.h>
#include <QtGui/QGraphicsWidget>
#include <QGraphicsWidget>
namespace Plasma
{

2
widgets/pushbutton.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_PUSHBUTTON_H
#define PLASMA_PUSHBUTTON_H
#include <QtGui/QGraphicsProxyWidget>
#include <QGraphicsProxyWidget>
#include <kicon.h>

2
widgets/radiobutton.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_RADIOBUTTON_H
#define PLASMA_RADIOBUTTON_H
#include <QtGui/QGraphicsProxyWidget>
#include <QGraphicsProxyWidget>
class QRadioButton;

4
widgets/scrollbar.h
View File

@ -21,8 +21,8 @@
#ifndef PLASMA_SCROLLBAR_H
#define PLASMA_SCROLLBAR_H
#include <QtGui/QScrollBar>
#include <QtGui/QGraphicsProxyWidget>
#include <QScrollBar>
#include <QGraphicsProxyWidget>
#include <plasma/plasma_export.h>

2
widgets/scrollwidget.h
View File

@ -21,7 +21,7 @@
#define PLASMA_SCROLLWIDGET_H
#include <QtCore/QAbstractAnimation>
#include <QtGui/QGraphicsWidget>
#include <QGraphicsWidget>
#include <plasma/plasma_export.h>

4
widgets/separator.cpp
View File

@ -19,8 +19,8 @@
#include "separator.h"
#include <QtGui/QPainter>
#include <QtGui/QGraphicsSceneMouseEvent>
#include <QPainter>
#include <QGraphicsSceneMouseEvent>
#include "svg.h"

2
widgets/separator.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_SEPARATOR_H
#define PLASMA_SEPARATOR_H
#include <QtGui/QGraphicsWidget>
#include <QGraphicsWidget>
#include <plasma/plasma_export.h>

8
widgets/signalplotter.cpp
View File

@ -28,10 +28,10 @@
#include <QApplication>
#include <QList>
#include <QPalette>
#include <QtGui/QPainter>
#include <QtGui/QPixmap>
#include <QtGui/QPainterPath>
#include <QtGui/QPolygon>
#include <QPainter>
#include <QPixmap>
#include <QPainterPath>
#include <QPolygon>
#include <kdebug.h>
#include <kglobal.h>

4
widgets/signalplotter.h
View File

@ -22,8 +22,8 @@
#ifndef PLASMA_SIGNALPLOTTER_H
#define PLASMA_SIGNALPLOTTER_H
#include <QtGui/QFont>
#include <QtGui/QGraphicsWidget>
#include <QFont>
#include <QGraphicsWidget>
#include <plasma/plasma_export.h>
namespace Plasma

2
widgets/slider.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_SLIDER_H
#define PLASMA_SLIDER_H
#include <QtGui/QGraphicsProxyWidget>
#include <QGraphicsProxyWidget>
#include <plasma/plasma_export.h>

2
widgets/spinbox.h
View File

@ -21,7 +21,7 @@
#ifndef PLASMA_SPINBOX_H
#define PLASMA_SPINBOX_H
#include <QtGui/QGraphicsProxyWidget>
#include <QGraphicsProxyWidget>
#include <plasma/plasma_export.h>

4
widgets/svgwidget.cpp
View File

@ -19,8 +19,8 @@
#include "svgwidget.h"
#include <QtGui/QPainter>
#include <QtGui/QGraphicsSceneMouseEvent>
#include <QPainter>
#include <QGraphicsSceneMouseEvent>
#include "kdebug.h"
#include "svg.h"

2
widgets/svgwidget.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_SVGWIDGET_H
#define PLASMA_SVGWIDGET_H
#include <QtGui/QGraphicsWidget>
#include <QGraphicsWidget>
#include <plasma/plasma_export.h>

2
widgets/tabbar.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_TABBAR_H
#define PLASMA_TABBAR_H
#include <QtGui/QGraphicsWidget>
#include <QGraphicsWidget>
#include <ktabbar.h>

2
widgets/textbrowser.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_TEXTBROWSER_H
#define PLASMA_TEXTBROWSER_H
#include <QtGui/QGraphicsProxyWidget>
#include <QGraphicsProxyWidget>
class KTextBrowser;

2
widgets/textedit.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_TEXTEDIT_H
#define PLASMA_TEXTEDIT_H
#include <QtGui/QGraphicsProxyWidget>
#include <QGraphicsProxyWidget>
class KTextEdit;

2
widgets/toolbutton.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_TOOLBUTTON_H
#define PLASMA_TOOLBUTTON_H
#include <QtGui/QGraphicsProxyWidget>
#include <QGraphicsProxyWidget>
class QToolButton;

2
widgets/treeview.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_TREEVIEW_H
#define PLASMA_TREEVIEW_H
#include <QtGui/QGraphicsProxyWidget>
#include <QGraphicsProxyWidget>
#include <plasma/plasma_export.h>

2
widgets/videowidget.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_VIDEOWIDGET_H
#define PLASMA_VIDEOWIDGET_H
#include <QtGui/QGraphicsProxyWidget>
#include <QGraphicsProxyWidget>
#include <plasma/plasma_export.h>

4
widgets/webview.cpp
View File

@ -18,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <QtGui/QApplication>
#include <QtGui/QStyleOptionGraphicsItem>
#include <QApplication>
#include <QStyleOptionGraphicsItem>
#include <fixx11h.h>
#include <QtWebKit/QWebFrame>

2
widgets/webview.h
View File

@ -21,7 +21,7 @@
#define PLASMA_WEBVIEW_H
#include <plasma/plasma_export.h>
#include <QtGui/QGraphicsWidget>
#include <QGraphicsWidget>
#include <kurl.h>

2
windoweffects.h
View File

@ -20,7 +20,7 @@
#ifndef PLASMA_WINDOWEFFECTS_H
#define PLASMA_WINDOWEFFECTS_H
#include <QtGui/QWidget>
#include <QWidget>
#include <plasma/plasma.h>