[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebindings/ruby/qtruby
From:       Richard Dale <Richard_Dale () tipitina ! demon ! co ! uk>
Date:       2010-03-18 11:17:54
Message-ID: 20100318111754.EDEE8AC855 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1104719 by rdale:

* Qualify all Qt includes with the module name, as not doing so is a bad
  idea IMHO.



 M  +5 -0      ChangeLog  
 M  +2 -2      tools/rbrcc/main.cpp  
 M  +6 -6      tools/rbrcc/rcc.cpp  
 M  +5 -5      tools/rbrcc/rcc.h  
 M  +4 -4      tools/rbuic/main.cpp  
 M  +1 -1      tools/rbuic/ruby/rbwritedeclaration.cpp  
 M  +1 -1      tools/rbuic/ruby/rbwriteicondeclaration.cpp  
 M  +1 -1      tools/rbuic/ui4.cpp  
 M  +3 -3      tools/rbuic/utils.h  


--- trunk/KDE/kdebindings/ruby/qtruby/ChangeLog #1104718:1104719
@@ -1,3 +1,8 @@
+2010-03-18  Richard Dale  <richard.j.dale@gmail.com>
+
+	* Qualify all Qt includes with the module name, as not doing so is a bad
+	  idea IMHO.
+
 2010-03-14  Richard Dale  <richard.j.dale@gmail.com>
 	
 	* The QtDBus classes weren't being correctly initialized as the count of 
--- trunk/KDE/kdebindings/ruby/qtruby/tools/rbrcc/main.cpp #1104718:1104719
@@ -22,8 +22,8 @@
 ****************************************************************************/
 
 #include "rcc.h"
-#include <QFile>
-#include <QDir>
+#include <QtCore/QFile>
+#include <QtCore/QDir>
 
 // Some static globals
 static bool writeBinary = false;
--- trunk/KDE/kdebindings/ruby/qtruby/tools/rbrcc/rcc.cpp #1104718:1104719
@@ -22,12 +22,12 @@
 ****************************************************************************/
 
 #include "rcc.h"
-#include <QFile>
-#include <QDateTime>
-#include <QByteArray>
-#include <QDir>
-#include <QStack>
-#include <QDomDocument>
+#include <QtCore/QFile>
+#include <QtCore/QDateTime>
+#include <QtCore/QByteArray>
+#include <QtCore/QDir>
+#include <QtCore/QStack>
+#include <QtXml/QDomDocument>
 
 static bool qt_rcc_write_number(FILE *out, quint32 number, int width, RCCResourceLibrary::Format format)
 {
--- trunk/KDE/kdebindings/ruby/qtruby/tools/rbrcc/rcc.h #1104718:1104719
@@ -24,11 +24,11 @@
 #ifndef RCC_H
 #define RCC_H
 
-#include <QStringList>
-#include <QFileInfo>
-#include <QLocale>
-#include <QHash>
-#include <QString>
+#include <QtCore/QStringList>
+#include <QtCore/QFileInfo>
+#include <QtCore/QLocale>
+#include <QtCore/QHash>
+#include <QtCore/QString>
 
 #define TAG_RCC "RCC"
 #define TAG_RESOURCE "qresource"
--- trunk/KDE/kdebindings/ruby/qtruby/tools/rbuic/main.cpp #1104718:1104719
@@ -44,10 +44,10 @@
 #include "uic.h"
 #include "option.h"
 #include "driver.h"
-#include <QFile>
-#include <QDir>
-#include <QTextStream>
-#include <QTextCodec>
+#include <QtCore/QFile>
+#include <QtCore/QDir>
+#include <QtCore/QTextStream>
+#include <QtCore/QTextCodec>
 
 #if defined(QT_BEGIN_NAMESPACE)
   QT_BEGIN_NAMESPACE
--- trunk/KDE/kdebindings/ruby/qtruby/tools/rbuic/ruby/rbwritedeclaration.cpp #1104718:1104719
@@ -51,7 +51,7 @@
 #include "databaseinfo.h"
 #include "customwidgetsinfo.h"
 
-#include <QTextStream>
+#include <QtCore/QTextStream>
 
 namespace Ruby {
 
--- trunk/KDE/kdebindings/ruby/qtruby/tools/rbuic/ruby/rbwriteicondeclaration.cpp #1104718:1104719
@@ -46,7 +46,7 @@
 #include "ui4.h"
 #include "uic.h"
 
-#include <QTextStream>
+#include <QtCore/QTextStream>
 
 #if defined(QT_BEGIN_NAMESPACE)
   QT_BEGIN_NAMESPACE
--- trunk/KDE/kdebindings/ruby/qtruby/tools/rbuic/ui4.cpp #1104718:1104719
@@ -41,7 +41,7 @@
 **
 ****************************************************************************/
 #include "ui4.h"
-#include <QDomDocument>
+#include <QtXml/QDomDocument>
 
 #if defined(QT_BEGIN_NAMESPACE)
   QT_BEGIN_NAMESPACE
--- trunk/KDE/kdebindings/ruby/qtruby/tools/rbuic/utils.h #1104718:1104719
@@ -45,9 +45,9 @@
 #define UTILS_H
 
 #include "ui4.h"
-#include <QString>
-#include <QList>
-#include <QHash>
+#include <QtCore/QString>
+#include <QtCore/QList>
+#include <QtCore/QHash>
 
 inline bool toBool(const QString &str)
 { return str.toLower() == QLatin1String("true"); }
[prev in list] [next in list] [prev in thread] [next in thread]