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

List:       kde-commits
Subject:    kdepim/kpilot
From:       Jason vanRijn Kasper <vR () movingparts ! net>
Date:       2005-04-18 11:54:57
Message-ID: 20050418115457.895AC625 () office ! kde ! org
[Download RAW message or body]

CVS commit by vanrijn: 

- agreeing with previous note that "This is a pilot constant and should
  probably be defined in a more sensible place but I'm lazy right now." and
  moving it from 2 cc-files (pilotComponent.cc and pilotDatabase.cc) to a 
  common header file (pilotAppCategory.h).  =;)
- using said MAX_CATEGORIES constant instead of hard-coding 16 in memofile
  conduit
CCBUGS:103922


  M +3 -3      conduits/memofileconduit/memofile-conduit.cc   1.14
  M +1 -6      kpilot/pilotComponent.cc   1.38
  M +2 -0      lib/pilotAppCategory.h   1.27
  M +0 -2      lib/pilotDatabase.cc   1.15


--- kdepim/kpilot/kpilot/pilotComponent.cc  #1.37:1.38
@@ -51,9 +51,4 @@ static const char *pilotComponent_id =
         "$Id$";
 
-// This is a pilot constant and should probably be defined
-// in a more sensible place but I'm lazy right now.
-//
-#define MAX_CATEGORIES  (16)
-
 PilotComponent::PilotComponent(QWidget * parent,
         const char *id,

--- kdepim/kpilot/lib/pilotAppCategory.h  #1.26:1.27
@@ -43,4 +43,6 @@
 #include "pilotRecord.h"
 
+#define MAX_CATEGORIES  (16)
+
 class QTextCodec;
 

--- kdepim/kpilot/lib/pilotDatabase.cc  #1.14:1.15
@@ -39,6 +39,4 @@
 #include "pilotAppCategory.h"
 
-#define MAX_CATEGORIES  (16)
-
 static int creationCount = 0;
 static QStringList *createdNames = 0L;

--- kdepim/kpilot/conduits/memofileconduit/memofile-conduit.cc  #1.13:1.14
@@ -190,5 +190,5 @@ bool MemofileConduit::setAppInfo()
         fCategories = map;
 
-        for (int i = 0; i < 16; i++)
+        for (int i = 0; i < MAX_CATEGORIES; i++)
         {
                 if (fCategories.contains(i)) {
@@ -276,5 +276,5 @@ bool MemofileConduit::loadPilotCategorie
         int _category_num=0;
 
-        for (int i = 0; i < 16; i++) {
+        for (int i = 0; i < MAX_CATEGORIES; i++) {
                 if (fMemoAppInfo.category.name[i][0]) {
                         _category_name = Memofiles::sanitizeName( \
PilotAppCategory::codec()->toUnicode(fMemoAppInfo.category.name[i]));


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