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

List:       kde-commits
Subject:    kdeadmin/kpackage
From:       Adriaan de Groot <adridg () cs ! kun ! nl>
Date:       2003-12-30 20:48:44
Message-ID: 20031230204844.B9FC793EA () office ! kde ! org
[Download RAW message or body]

CVS commit by adridg: 

Pedantics: use config.h; set name first and warn of no group set.


  M +16 -11    packageInfo.cpp   1.35


--- kdeadmin/kpackage/packageInfo.cpp  #1.34:1.35
@@ -8,5 +8,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "../config.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 // Standard headers
 #include <stdlib.h>
@@ -14,7 +17,10 @@
 #include <qregexp.h>
 #include <qdir.h>
+#include <ctype.h>
 
 // KDE headers
 #include <kglobal.h>
+#include <klocale.h>
+#include <kdebug.h>
 
 // kpackage headers
@@ -26,6 +32,4 @@
 #include "utils.h"
 #include "options.h"
-#include <klocale.h>
-#include <ctype.h>
 
 // Global pixmap for
@@ -87,16 +91,17 @@ QDict<QString> *packageInfo::getDict()
 void packageInfo::fixup()
 {
+  if (!info->find("name")) {
+    QString *q = new QString();
+    q->setNum((int)this);
+    info->insert("name", q);
+  }
+
   if (!info->find("group")) {
     info->insert("group", new QString(i18n("OTHER")));
+    kdDebug() << "Package " << *(info->find("name")) << " has no group set." << endl;
   }
 
   if (!info->find("version")) {
-    info->insert("version", new QString(""));
-  }
-
-  if (!info->find("name")) {
-    QString *q = new QString("");;
-    q->setNum((int)this);
-    info->insert("name", q);
+    info->insert("version", new QString());
   }
 }


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