patch to fix the bad Qt include directives

libreoffice-4.4.1.2-fix-old-qt-includes.diff (text/plain), 5.91 KB, created by Thomas on 2015-04-03 06:35:36 UTC

--- libreoffice-4.4.1.2/vcl/unx/kde4/KDE4FilePicker.cxx.orig	2015-03-27 06:40:25.684642842 +0100
+++ libreoffice-4.4.1.2/vcl/unx/kde4/KDE4FilePicker.cxx	2015-03-27 06:43:56.197186285 +0100
@@ -49,10 +49,10 @@
 #include <kservicetypetrader.h>
 #include <kmessagebox.h>
 
-#include <qclipboard.h>
-#include <QWidget>
-#include <QCheckBox>
-#include <QGridLayout>
+#include <QtGui/QClipboard>
+#include <QtGui/QWidget>
+#include <QtGui/QCheckBox>
+#include <QtGui/QGridLayout>
 
 #undef Region
 
@@ -82,7 +82,7 @@
 
 // helper functions
 
-#include <QDebug>
+#include <QtCore/QDebug>
 
 namespace
 {
--- libreoffice-4.4.1.2/vcl/unx/kde4/KDE4FilePicker.hxx.orig	2015-03-28 07:14:21.000000000 +0100
+++ libreoffice-4.4.1.2/vcl/unx/kde4/KDE4FilePicker.hxx	2015-03-28 08:04:48.081798181 +0100
@@ -33,9 +33,9 @@
 
 #include <rtl/ustrbuf.hxx>
 
-#include <QObject>
-#include <QString>
-#include <QHash>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QHash>
 
 class KFileDialog;
 class QWidget;
--- libreoffice-4.4.1.2/vcl/unx/kde4/KDEData.cxx.orig	2015-02-20 18:33:24.000000000 +0100
+++ libreoffice-4.4.1.2/vcl/unx/kde4/KDEData.cxx	2015-03-27 06:43:56.284185672 +0100
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <QStyle>
+#include <QtGui/QStyle>
 #include <kapplication.h>
 
 #undef Region
--- libreoffice-4.4.1.2/vcl/unx/kde4/KDESalFrame.cxx.orig	2015-02-20 18:33:24.000000000 +0100
+++ libreoffice-4.4.1.2/vcl/unx/kde4/KDESalFrame.cxx	2015-03-27 06:43:56.330185348 +0100
@@ -17,8 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <QColor>
-#include <QStyle>
+#include <QtGui/QColor>
+#include <QtGui/QStyle>
+#include <QtCore/QDebug>
+#include <QtGui/QToolTip>
 
 #include <kconfig.h>
 #include <kglobal.h>
@@ -27,8 +29,6 @@
 #include <kmainwindow.h>
 #include <kapplication.h>
 #include <ktoolbar.h>
-#include <qdebug.h>
-#include <qtooltip.h>
 
 #undef Region
 
--- libreoffice-4.4.1.2/vcl/unx/kde4/KDESalGraphics.cxx.orig	2015-02-20 18:33:24.000000000 +0100
+++ libreoffice-4.4.1.2/vcl/unx/kde4/KDESalGraphics.cxx	2015-03-27 06:43:56.343185256 +0100
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <QStyle>
-#include <QStyleOption>
-#include <QPainter>
-#include <QFrame>
-#include <QLabel>
+#include <QtGui/QStyle>
+#include <QtGui/QStyleOption>
+#include <QtGui/QPainter>
+#include <QtGui/QFrame>
+#include <QtGui/QLabel>
 
 #include <kapplication.h>
 #include <kdebug.h>
--- libreoffice-4.4.1.2/vcl/unx/kde4/KDESalGraphics.hxx.orig	2015-03-27 06:43:56.373185044 +0100
+++ libreoffice-4.4.1.2/vcl/unx/kde4/KDESalGraphics.hxx	2015-03-27 06:45:12.938645144 +0100
@@ -23,7 +23,7 @@
 #include <unx/saldisp.hxx>
 #include <unx/salgdi.h>
 
-#include <QImage>
+#include <QtGui/QImage>
 
 /** handles graphics drawings requests and performs the needed drawing operations */
 class KDESalGraphics : public X11SalGraphics
--- libreoffice-4.4.1.2/vcl/unx/kde4/KDEXLib.cxx.orig	2015-02-20 18:33:24.000000000 +0100
+++ libreoffice-4.4.1.2/vcl/unx/kde4/KDEXLib.cxx	2015-03-28 08:12:05.363880899 +0100
@@ -26,9 +26,9 @@
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <kstartupinfo.h>
-#include <qabstracteventdispatcher.h>
-#include <qclipboard.h>
-#include <qthread.h>
+#include <QtCore/QAbstractEventDispatcher>
+#include <QtGui/QClipboard>
+#include <QtCore/QThread>
 
 #include "KDEXLib.hxx"
 
@@ -420,7 +420,7 @@
 #endif
 }
 
-#include <qframe.h>
+#include <QtGui/QFrame>
 
 int KDEXLib::getFrameWidth()
 {
--- libreoffice-4.4.1.2/vcl/unx/kde4/KDEXLib.hxx.orig	2015-02-20 18:33:24.000000000 +0100
+++ libreoffice-4.4.1.2/vcl/unx/kde4/KDEXLib.hxx	2015-03-28 08:08:03.475511011 +0100
@@ -23,9 +23,9 @@
 
 #include <fixx11h.h>
 
-#include <qhash.h>
-#include <qsocketnotifier.h>
-#include <qtimer.h>
+#include <QtCore/QHash>
+#include <QtCore/QSocketNotifier>
+#include <QtCore/QTimer>
 
 #include <unx/salinst.h>
 
--- libreoffice-4.4.1.2/vcl/unx/kde4/main.cxx.orig	2015-03-27 06:43:56.485184255 +0100
+++ libreoffice-4.4.1.2/vcl/unx/kde4/main.cxx	2015-03-27 06:45:42.962433381 +0100
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <QApplication>
+#include <QtGui/QApplication>
 
 #include "KDEData.hxx"
 #include "KDESalInstance.hxx"
--- libreoffice-4.4.1.2/vcl/unx/kde4/tst_exclude_posted_events.hxx.orig	2015-02-20 18:33:24.000000000 +0100
+++ libreoffice-4.4.1.2/vcl/unx/kde4/tst_exclude_posted_events.hxx	2015-03-28 08:13:12.575433882 +0100
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include <qcoreapplication.h>
-#include <qeventloop.h>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QEventLoop>
 
 namespace
 {
--- libreoffice-4.4.1.2/vcl/unx/kde4/tst_exclude_socket_notifiers.hxx.orig	2015-02-20 18:33:24.000000000 +0100
+++ libreoffice-4.4.1.2/vcl/unx/kde4/tst_exclude_socket_notifiers.hxx	2015-03-28 08:15:09.590661567 +0100
@@ -21,9 +21,9 @@
 
 #pragma once
 
-#include <qcoreapplication.h>
-#include <qeventloop.h>
-#include <qsocketnotifier.h>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QEventLoop>
+#include <QtCore/QSocketNotifier>
 #include <unistd.h>
 
 namespace
--- libreoffice-4.4.1.2/shell/source/backends/kde4be/kde4access.cxx.orig	2015-02-20 18:33:24.000000000 +0100
+++ libreoffice-4.4.1.2/shell/source/backends/kde4be/kde4access.cxx	2015-03-28 08:34:42.724293182 +0100
@@ -19,8 +19,8 @@
 
 #include "sal/config.h"
 
-#include "QFont"
-#include "QString"
+#include <QtGui/QFont>
+#include <QtCore/QString>
 #include "kemailsettings.h"
 #include "kglobalsettings.h"
 #include "kprotocolmanager.h"
--- libreoffice-4.4.1.2/vcl/unx/kde4/VCLKDEApplication.cxx.orig	2015-02-20 18:33:24.000000000 +0100
+++ libreoffice-4.4.1.2/vcl/unx/kde4/VCLKDEApplication.cxx	2015-03-28 12:10:33.684066253 +0100
@@ -19,8 +19,8 @@
 
 #include "VCLKDEApplication.hxx"
 
-#include <QClipboard>
-#include <QEvent>
+#include <QtGui/QClipboard>
+#include <QtCore/QEvent>
 
 #include "KDESalDisplay.hxx"