KDE/kdevelop

[Andreas Pakulat]

SVN commit 695982 by apaku:

krazy fixes.
@Everybody: Don't use QString::null, use QString() instead
CCMAIL:kdevelop-devel at kdevelop.org


 M  +1 -1      buildtools/managers/cmake/cmakemanager.cpp  
 M  +1 -1      buildtools/managers/cmake/parser/cmakeprojectvisitor.cpp  
 M  +1 -1      languages/cpp/preprocessjob.cpp  
 M  +2 -2      plugins/grepview/grepdialog.h  


--- trunk/KDE/kdevelop/buildtools/managers/cmake/cmakemanager.cpp #695981:695982
@@ -130,7 +130,7 @@
     foreach(QString s, v.includeDirectories())
     {
         KUrl path;
-        if(s.startsWith("/"))
+        if(s.startsWith('/'))
         {
             path=s;
         }
--- trunk/KDE/kdevelop/buildtools/managers/cmake/parser/cmakeprojectvisitor.cpp #695981:695982
@@ -90,7 +90,7 @@
 
     switch(type) {
         case NoVar:
-            return QString::null;
+            return QString();
         case CMake:
             exp="\\$\\{[A-z0-9-]+\\}";
             break;
--- trunk/KDE/kdevelop/languages/cpp/preprocessjob.cpp #695981:695982
@@ -225,7 +225,7 @@
     kDebug(9007) << "PreprocessJob" << parentJob()->document() << ": searching for include" << fileName;
 
     KUrl localPath(parentJob()->document());
-    localPath.setFileName(QString::null);
+    localPath.setFileName(QString());
     
     QPair<KUrl, KUrl> included = parentJob()->cpp()->findInclude(parentJob()->includePaths(), localPath, fileName, type, skipCurrentPath ? parentJob()->includedFromPath() : KUrl() );
     KUrl includedFile = included.first;
--- trunk/KDE/kdevelop/plugins/grepview/grepdialog.h #695981:695982
@@ -10,8 +10,8 @@
 *                                                                         *
 ***************************************************************************/
 
-#ifndef GREPWIDGET_H
-#define GREPWIDGET_H
+#ifndef GREPDIALOG_H
+#define GREPDIALOG_H
 
 #include <kdialog.h>
 #include "ui_grepwidget.h"