generic: adjust to Katie changes

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/bluedevil/src/wizard/wizardagent.cpp b/bluedevil/src/wizard/wizardagent.cpp
index 34b2651..8c90915 100644 (file)
--- a/bluedevil/src/wizard/wizardagent.cpp
+++ b/bluedevil/src/wizard/wizardagent.cpp
@@ -22,6 +22,7 @@
 
 #include <QFile>
 #include <QDBusMessage>
+#include <QXmlStreamReader>
 #include <bluedevil/bluedevil.h>
 #include <KDebug>
 #include <KAboutData>

diff --git a/bluedevil/src/wizard/wizardagent.h b/bluedevil/src/wizard/wizardagent.h
index 560e440..0a8b09b 100644 (file)
--- a/bluedevil/src/wizard/wizardagent.h
+++ b/bluedevil/src/wizard/wizardagent.h
@@ -24,7 +24,6 @@
 
 #include <QtDBus>
 #include <QApplication>
-#include <QtCore/qxmlstream.h>
 
 namespace BlueDevil {
     class Device;

diff --git a/kdeplasma-addons/applets/bubblemon/src/bubble.cpp b/kdeplasma-addons/applets/bubblemon/src/bubble.cpp
index 4d60d19..e582e3a 100644 (file)
--- a/kdeplasma-addons/applets/bubblemon/src/bubble.cpp
+++ b/kdeplasma-addons/applets/bubblemon/src/bubble.cpp
@@ -20,12 +20,11 @@
 
 #include <QtCore/QTimeLine>
 #include <QtCore/QTimer>
-#include <QtCore/QPropertyAnimation>
+#include <QPropertyAnimation>
 #include <QtGui/QPainter>
 #include <QtGui/qstyleoption.h>
 #include <QtGui/qgraphicssceneevent.h>
 #include <QtGui/QStandardItemModel>
-#include <QtGui/qstandarditemmodel.h>
 #include <QtGui/QSortFilterProxyModel>
 
 #include <Plasma/Theme>

diff --git a/kdeplasma-addons/applets/plasmaboard/Layout.cpp b/kdeplasma-addons/applets/plasmaboard/Layout.cpp
index cf4be3b..e4e5b2b 100644 (file)
--- a/kdeplasma-addons/applets/plasmaboard/Layout.cpp
+++ b/kdeplasma-addons/applets/plasmaboard/Layout.cpp
@@ -19,7 +19,7 @@
 
 #include "Layout.h"
 #include <QFile>
-#include <QtCore/qxmlstream.h>
+#include <QXmlStreamReader>
 #include <KLocale>
 
 Layout::Layout(QString path)

diff --git a/kdeplasma-addons/applets/plasmaboard/widget.cpp b/kdeplasma-addons/applets/plasmaboard/widget.cpp
index 47001c7..fa8aff7 100644 (file)
--- a/kdeplasma-addons/applets/plasmaboard/widget.cpp
+++ b/kdeplasma-addons/applets/plasmaboard/widget.cpp
@@ -43,6 +43,7 @@
 #include <QSignalMapper>
 #include <QtGui/qstyleoption.h>
 #include <QTimer>
+#include <QXmlStreamReader>
 #include <plasma/containment.h>
 #include <plasma/corona.h>
 #include <plasma/theme.h>

diff --git a/kdeplasma-addons/applets/plasmaboard/widget.h b/kdeplasma-addons/applets/plasmaboard/widget.h
index 7096366..4cb6756 100644 (file)
--- a/kdeplasma-addons/applets/plasmaboard/widget.h
+++ b/kdeplasma-addons/applets/plasmaboard/widget.h
@@ -23,7 +23,8 @@
 #include "tooltip.h"
 
 #include <QGraphicsWidget>
-#include <QtCore/qxmlstream.h>
+#include <QSignalMapper>
+#include <QTimer>
 #include <plasma/popupapplet.h>
 #include <plasma/dataengine.h>
 
@@ -36,8 +37,6 @@ class AlphaNumKey;
 class BoardKey;
 class DualKey;
 class FuncKey;
-#include <QSignalMapper>
-#include <QTimer>
 class StickyKey;
 class SwitchKey;
 
@@ -224,9 +223,11 @@ private:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(PlasmaboardWidget::StateActions)
 
+QT_BEGIN_NAMESPACE
 inline uint qHash(const QSize &key)
 {
     return qHash(key.width()) + qHash(key.height());
 }
+QT_END_NAMESPACE
 
 #endif /* WIDGET_H */

diff --git a/kdeplasma-addons/containments/groupingdesktop/lib/groupexplorer/explorerwindow.h b/kdeplasma-addons/containments/groupingdesktop/lib/groupexplorer/explorerwindow.h
index dd3dd31..e9adf50 100644 (file)
--- a/kdeplasma-addons/containments/groupingdesktop/lib/groupexplorer/explorerwindow.h
+++ b/kdeplasma-addons/containments/groupingdesktop/lib/groupexplorer/explorerwindow.h
@@ -21,6 +21,7 @@
 #define EXPLORERWINDOW_H
 
 #include <QWidget>
+#include <QTimer>
 
 #include <Plasma/Plasma>
 

diff --git a/kdeplasma-addons/containments/groupingdesktop/lib/groups/tabbinggroup.h b/kdeplasma-addons/containments/groupingdesktop/lib/groups/tabbinggroup.h
index fa15fcb..eb6dfce 100644 (file)
--- a/kdeplasma-addons/containments/groupingdesktop/lib/groups/tabbinggroup.h
+++ b/kdeplasma-addons/containments/groupingdesktop/lib/groups/tabbinggroup.h
@@ -27,6 +27,7 @@
 
 #include <QGraphicsLinearLayout>
 #include <QGraphicsProxyWidget>
+#include <QTimer>
 
 class KConfigDialog;
 

diff --git a/kdeplasma-addons/dataengines/potd/flickrprovider.cpp b/kdeplasma-addons/dataengines/potd/flickrprovider.cpp
index f544f93..b925619 100644 (file)
--- a/kdeplasma-addons/dataengines/potd/flickrprovider.cpp
+++ b/kdeplasma-addons/dataengines/potd/flickrprovider.cpp
@@ -23,7 +23,7 @@
 
 #include <QtCore/QRegExp>
 #include <QtGui/QImage>
-#include <QtCore/qxmlstream.h>
+#include <QXmlStreamReader>
 
 #include <KDebug>
 #include <kio/job.h>

diff --git a/kdeplasma-addons/libs/lancelot-datamodels/Devices.h b/kdeplasma-addons/libs/lancelot-datamodels/Devices.h
index e01b639..8a2486d 100644 (file)
--- a/kdeplasma-addons/libs/lancelot-datamodels/Devices.h
+++ b/kdeplasma-addons/libs/lancelot-datamodels/Devices.h
@@ -25,7 +25,6 @@
 #include "BaseModel.h"
 #include <solid/device.h>
 #include <solid/storageaccess.h>
-#include <QtCore/qxmlstream.h>
 
 namespace Lancelot {
 namespace Models {

diff --git a/kdeplasma-addons/libs/lancelot-datamodels/Devices_p.h b/kdeplasma-addons/libs/lancelot-datamodels/Devices_p.h
index 4b5f53c..483b5b8 100644 (file)
--- a/kdeplasma-addons/libs/lancelot-datamodels/Devices_p.h
+++ b/kdeplasma-addons/libs/lancelot-datamodels/Devices_p.h
@@ -23,7 +23,7 @@
 #include "Devices.h"
 #include <solid/device.h>
 #include <solid/storageaccess.h>
-#include <QtCore/qxmlstream.h>
+#include <QXmlStreamReader>
 
 namespace Lancelot {
 namespace Models {

diff --git a/kdeplasma-addons/libs/lancelot-datamodels/FavoriteApplications.cpp b/kdeplasma-addons/libs/lancelot-datamodels/FavoriteApplications.cpp
index 43a91ee..dcc8587 100644 (file)
--- a/kdeplasma-addons/libs/lancelot-datamodels/FavoriteApplications.cpp
+++ b/kdeplasma-addons/libs/lancelot-datamodels/FavoriteApplications.cpp
@@ -187,7 +187,7 @@ void FavoriteApplications::dataDropped(int where, const QMimeData * mimeData)
         KUrl url = KUrl(QString(mimeData->data("text/uri-list")));
 
         for (int i = 0; i < size(); i++) {
-            if (url.path() == itemAt(i).data) {
+            if (url.path() == itemAt(i).data.toString()) {
                 from = i;
                 break;
             }

diff --git a/kdeplasma-addons/libs/lancelot-datamodels/FolderModel.cpp b/kdeplasma-addons/libs/lancelot-datamodels/FolderModel.cpp
index 819fd43..80adc36 100644 (file)
--- a/kdeplasma-addons/libs/lancelot-datamodels/FolderModel.cpp
+++ b/kdeplasma-addons/libs/lancelot-datamodels/FolderModel.cpp
@@ -223,7 +223,7 @@ void FolderModel::dataDropped(int where, const QMimeData * mimeData)
         KUrl url = KUrl(QString(mimeData->data("text/uri-list")));
 
         for (int i = 0; i < size(); i++) {
-            if (url.path() == itemAt(i).data) {
+            if (url.path() == itemAt(i).data.toString()) {
                 from = i;
                 break;
             }

diff --git a/kdeplasma-addons/libs/lancelot-datamodels/XbelModel.cpp b/kdeplasma-addons/libs/lancelot-datamodels/XbelModel.cpp
index b3c2353..cfc2abf 100644 (file)
--- a/kdeplasma-addons/libs/lancelot-datamodels/XbelModel.cpp
+++ b/kdeplasma-addons/libs/lancelot-datamodels/XbelModel.cpp
@@ -20,6 +20,7 @@
 #include "XbelModel.h"
 #include <KIcon>
 #include <QFile>
+#include <QXmlStreamReader>
 
 namespace Lancelot {
 namespace Models {

diff --git a/kdeplasma-addons/libs/lancelot-datamodels/XbelModel.h b/kdeplasma-addons/libs/lancelot-datamodels/XbelModel.h
index 9069030..5bf24d7 100644 (file)
--- a/kdeplasma-addons/libs/lancelot-datamodels/XbelModel.h
+++ b/kdeplasma-addons/libs/lancelot-datamodels/XbelModel.h
@@ -23,7 +23,6 @@
 #include <lancelot/lancelot_export.h>
 
 #include "BaseModel.h"
-#include <QtCore/qxmlstream.h>
 
 namespace Lancelot {
 namespace Models {

diff --git a/kdeplasma-addons/libs/lancelot/widgets/kineticscroll_p.h b/kdeplasma-addons/libs/lancelot/widgets/kineticscroll_p.h
index fef76e7..92a6435 100644 (file)
--- a/kdeplasma-addons/libs/lancelot/widgets/kineticscroll_p.h
+++ b/kdeplasma-addons/libs/lancelot/widgets/kineticscroll_p.h
@@ -24,8 +24,8 @@
 #include <QGraphicsSceneWheelEvent>
 #include <QKeyEvent>
 #include <QObject>
-#include <QtCore/qpoint.h>
-#include <QtCore/QAbstractAnimation>
+#include <QPoint>
+#include <QAbstractAnimation>
 
 
 namespace Plasma

diff --git a/kdeplasma-addons/libs/rtm/xmlreaders.h b/kdeplasma-addons/libs/rtm/xmlreaders.h
index 19cf33c..449b80d 100644 (file)
--- a/kdeplasma-addons/libs/rtm/xmlreaders.h
+++ b/kdeplasma-addons/libs/rtm/xmlreaders.h
@@ -21,7 +21,7 @@
 #define XMLREADERS_H
 
 #include <QDateTime>
-#include <QtCore/qxmlstream.h>
+#include <QXmlStreamReader>
 
 #include "rtm.h"
 #include "list.h"

diff --git a/kdeplasma-addons/runners/mediawiki/mediawiki.cpp b/kdeplasma-addons/runners/mediawiki/mediawiki.cpp
index c008b08..7990266 100644 (file)
--- a/kdeplasma-addons/runners/mediawiki/mediawiki.cpp
+++ b/kdeplasma-addons/runners/mediawiki/mediawiki.cpp
@@ -23,7 +23,7 @@
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
-#include <QtCore/qxmlstream.h>
+#include <QXmlStreamReader>
 #include <QTimer>
 
 #include <KDebug>

diff --git a/kfilemetadata/src/extractors/odfextractor.cpp b/kfilemetadata/src/extractors/odfextractor.cpp
index 99c2190..e338440 100644 (file)
--- a/kfilemetadata/src/extractors/odfextractor.cpp
+++ b/kfilemetadata/src/extractors/odfextractor.cpp
@@ -25,7 +25,7 @@
 #include <KZip>
 
 #include <QtXml/qdom.h>
-#include <QtCore/qxmlstream.h>
+#include <QXmlStreamReader>
 
 using namespace KFileMetaData;
 

diff --git a/kfilemetadata/src/extractors/office2007extractor.cpp b/kfilemetadata/src/extractors/office2007extractor.cpp
index 644ce33..0144741 100644 (file)
--- a/kfilemetadata/src/extractors/office2007extractor.cpp
+++ b/kfilemetadata/src/extractors/office2007extractor.cpp
@@ -24,7 +24,7 @@
 #include <KZip>
 
 #include <QtXml/qdom.h>
-#include <QtCore/qxmlstream.h>
+#include <QXmlStreamReader>
 
 using namespace KFileMetaData;
 

diff --git a/kmix/core/volume.cpp b/kmix/core/volume.cpp
index dfc363f..e1d06b4 100644 (file)
--- a/kmix/core/volume.cpp
+++ b/kmix/core/volume.cpp
@@ -26,6 +26,7 @@
 
 #include <kdebug.h>
 #include <klocalizedstring.h>
+#include <qmath.h>
 
 float Volume::VOLUME_STEP_DIVISOR = 20;
 float Volume::VOLUME_PAGESTEP_DIVISOR = 10;

diff --git a/kmix/gui/dialogviewconfiguration.h b/kmix/gui/dialogviewconfiguration.h
index ef742ad..267f849 100644 (file)
--- a/kmix/gui/dialogviewconfiguration.h
+++ b/kmix/gui/dialogviewconfiguration.h
@@ -45,7 +45,7 @@
 
 class DialogViewConfigurationItem : public QListWidgetItem
 {
- friend #include <QDataStream>
+ friend class QDataStream;
 
 
  public:

diff --git a/ksnapshot/freeregiongrabber.cpp b/ksnapshot/freeregiongrabber.cpp
index be96de5..d6efe2d 100644 (file)
--- a/ksnapshot/freeregiongrabber.cpp
+++ b/ksnapshot/freeregiongrabber.cpp
@@ -296,7 +296,10 @@ void FreeRegionGrabber::grabRect()
         QPainter pt;
         pt.begin(&pixmap2);
         if (pt.paintEngine()->hasFeature(QPaintEngine::PorterDuff)) {
-            pt.setRenderHints(QPainter::Antialiasing | QPainter::HighQualityAntialiasing | QPainter::SmoothPixmapTransform, true);
+            pt.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, true);
+#ifndef QT_NO_OPENGL
+            pst.setRenderHints(QPainter::HighQualityAntialiasing, true);
+#endif
             pt.setBrush(Qt::black);
             pt.setPen(QPen(QBrush(Qt::black), 0.5));
             pt.drawPolygon(translatedPol);

diff --git a/ksnapshot/ksnapshot.cpp b/ksnapshot/ksnapshot.cpp
index c696cbb..7d1b8da 100644 (file)
--- a/ksnapshot/ksnapshot.cpp
+++ b/ksnapshot/ksnapshot.cpp
@@ -35,7 +35,7 @@
 #include <QDrag>
 
 #include <QPainter>
-#include <QtCore/qxmlstream.h>
+#include <QXmlStreamReader>
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusConnectionInterface>
 #include <QtDBus/QDBusInterface>

diff --git a/ksnapshot/ksnapshotobject.cpp b/ksnapshot/ksnapshotobject.cpp
index 608f7dc..db42404 100644 (file)
--- a/ksnapshot/ksnapshotobject.cpp
+++ b/ksnapshot/ksnapshotobject.cpp
@@ -175,10 +175,12 @@ bool KSnapshotObject::saveImage( QIODevice *device, const QByteArray &format )
        imgWriter.setQuality( 85 );
     }
 
+#ifndef QT_NO_IMAGE_TEXT
     if ( !title.isEmpty() )
        imgWriter.setText( i18n("Title"), title );
     if ( !windowClass.isEmpty() )
        imgWriter.setText( i18n("Window Class"), windowClass );
+#endif
 
     QImage snap = snapshot.toImage();
     return imgWriter.write( snap );

diff --git a/ksnapshot/windowgrabber.cpp b/ksnapshot/windowgrabber.cpp
index 6a8be02..e4c2b58 100644 (file)
--- a/ksnapshot/windowgrabber.cpp
+++ b/ksnapshot/windowgrabber.cpp
@@ -51,11 +51,12 @@ static UINT cxWindowBorder, cyWindowBorder;
 static
 const int minSize = 8;
 
-static
-bool operator< ( const QRect& r1, const QRect& r2 )
+QT_BEGIN_NAMESPACE
+static inline bool operator< ( const QRect& r1, const QRect& r2 )
 {
     return r1.width() * r1.height() < r2.width() * r2.height();
 }
+QT_END_NAMESPACE
 
 // Recursively iterates over the window w and its children, thereby building
 // a tree of window descriptors. Windows in non-viewable state or with height

diff --git a/ksystemlog/src/generalConfigurationWidget.cpp b/ksystemlog/src/generalConfigurationWidget.cpp
index 3a49494..552395a 100644 (file)
--- a/ksystemlog/src/generalConfigurationWidget.cpp
+++ b/ksystemlog/src/generalConfigurationWidget.cpp
@@ -99,7 +99,7 @@ void GeneralConfigurationWidget::addDateFormatExample() {
 
 void GeneralConfigurationWidget::readConfig() {
        for (int i=0; i<startupLogMode->count(); ++i) {
-               if (KSystemLogConfig::startupLogMode() == startupLogMode->itemData(i)) {
+               if (KSystemLogConfig::startupLogMode() == startupLogMode->itemData(i).toString()) {
                        startupLogMode->setCurrentIndex(i);
                        break;
                }

diff --git a/libkscreen/src/edid.cpp b/libkscreen/src/edid.cpp
index 078da61..9b6a162 100644 (file)
--- a/libkscreen/src/edid.cpp
+++ b/libkscreen/src/edid.cpp
@@ -24,7 +24,6 @@
 #include <QCryptographicHash>
 #include <QFile>
 #include <QStringList>
-#include <QStringBuilder>
 
 #include <kdebug.h>
 
@@ -138,20 +137,20 @@ QString Edid::deviceId(const QString &fallbackName) const
     // if no info was added check if the fallbacName is provided
     if (vendor().isNull() && name().isNull() && serial().isNull()) {
         if (!fallbackName.isEmpty()) {
-            id.append(QLatin1Char('-') % fallbackName);
+            id.append(QLatin1Char('-') + fallbackName);
         } else {
             // all info we have are empty strings
             id.append(QLatin1String("-unknown"));
         }
     } else if (d->valid) {
         if (!vendor().isNull()) {
-            id.append(QLatin1Char('-') % vendor());
+            id.append(QLatin1Char('-') + vendor());
         }
         if (!name().isNull()) {
-            id.append(QLatin1Char('-') % name());
+            id.append(QLatin1Char('-') + name());
         }
         if (!serial().isNull()) {
-            id.append(QLatin1Char('-') % serial());
+            id.append(QLatin1Char('-') + serial());
         }
     }
 

diff --git a/lokalize/src/tm/dbfilesmodel.h b/lokalize/src/tm/dbfilesmodel.h
index 530f830..6f3fa32 100644 (file)
--- a/lokalize/src/tm/dbfilesmodel.h
+++ b/lokalize/src/tm/dbfilesmodel.h
@@ -29,7 +29,7 @@
 #include <QSortFilterProxyModel>
 #include <QtCore/qdatetime.h>
 #include <QFileSystemModel>
-class QPersistentModelIndex;
+#include <QPersistentModelIndex>
 
 namespace ThreadWeaver{class Job;}
 

diff --git a/lokalize/src/tools/widgettextcaptureconfig.h b/lokalize/src/tools/widgettextcaptureconfig.h
index 2a6e72e..be793eb 100644 (file)
--- a/lokalize/src/tools/widgettextcaptureconfig.h
+++ b/lokalize/src/tools/widgettextcaptureconfig.h
@@ -26,7 +26,9 @@
 
 #include <KDialog>
 
+QT_BEGIN_NAMESPACE
 class Ui_WidgetTextCapture;
+QT_END_NAMESPACE
 
 class WidgetTextCaptureConfig: public KDialog
 {

diff --git a/lokalize/src/webquery/webqueryview.h b/lokalize/src/webquery/webqueryview.h
index b15b242..37a391e 100644 (file)
--- a/lokalize/src/webquery/webqueryview.h
+++ b/lokalize/src/webquery/webqueryview.h
@@ -35,18 +35,19 @@
 
 #include <pos.h>
 #include <QDockWidget>
-//#include <QList>
-class Catalog;
-// class FlowLayout;
-// #include <QHBoxLayout>
+#include <QVector>
 #include <QSplitter>
 #include <QTextBrowser>
 #include <QDragEnterEvent>
 #include <QDropEvent>
 #include <QEvent>
+
 class KAction;
+class Catalog;
+
+QT_BEGIN_NAMESPACE
 class Ui_QueryControl;
-#include <QVector>
+QT_END_NAMESPACE
 
 #define WEBQUERY_SHORTCUTS 10
 /**