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

List:       kde-commits
Subject:    kdeextragear-3
From:       Dirk Mueller <mueller () kde ! org>
Date:       2005-03-24 19:42:36
Message-ID: 20050324194236.EDC283EC () office ! kde ! org
[Download RAW message or body]

CVS commit by mueller: 

compile


  M +3 -0      kcfgcreator/src/token.h   1.2
  M +1 -0      kdetv/libkdetv/pluginfactory.h   1.29
  M +15 -11    pwmanager/pwmanager/mainwindow.cpp   1.4


--- kdeextragear-3/kcfgcreator/src/token.h  #1.1:1.2
@@ -34,4 +34,7 @@
 namespace KCfgCreator
 {
+
+    class Memento;
+
     class Token
     {

--- kdeextragear-3/kdetv/libkdetv/pluginfactory.h  #1.28:1.29
@@ -80,4 +80,5 @@ public:
 
 class KConfig;
+class Kdetv;
 
 /**

--- kdeextragear-3/pwmanager/pwmanager/mainwindow.cpp  #1.3:1.4
@@ -49,8 +49,8 @@ enum {
         BUTTON_POPUP_FILE_IMPORT,
         BUTTON_POPUP_FILE_PRINT,
-        BUTTON_POPUP_FILE_QUIT,
+        BUTTON_POPUP_FILE_QUIT
 };
 enum {
-        BUTTON_POPUP_MANAGE_CHMASTERKEY = 0,
+        BUTTON_POPUP_MANAGE_CHMASTERKEY = 0
 };
 enum {
@@ -59,14 +59,14 @@ enum {
         BUTTON_POPUP_SMARTCARD_ERASE,
         BUTTON_POPUP_SMARTCARD_TOFILE,
-        BUTTON_POPUP_SMARTCARD_FROMFILE,
+        BUTTON_POPUP_SMARTCARD_FROMFILE
 };
 enum {
-        BUTTON_POPUP_VIEW_FIND = 0,
+        BUTTON_POPUP_VIEW_FIND = 0
 };
 enum {
-        BUTTON_POPUP_TOOLS_PWGEN = 0,
+        BUTTON_POPUP_TOOLS_PWGEN = 0
 };
 enum {
-        BUTTON_POPUP_SETTINGS_CONFIG = 0,
+        BUTTON_POPUP_SETTINGS_CONFIG = 0
 };
 enum {
@@ -74,7 +74,9 @@ enum {
         BUTTON_POPUP_EXPORT_GPASMAN,
         BUTTON_POPUP_EXPORT_PWSAFE,
-        BUTTON_POPUP_EXPORT_CSV,
 #ifdef CONFIG_KWALLETIF
-        BUTTON_POPUP_EXPORT_KWALLET,
+        BUTTON_POPUP_EXPORT_CSV,
+        BUTTON_POPUP_EXPORT_KWALLET
+#else
+        BUTTON_POPUP_EXPORT_CSV
 #endif
 };
@@ -83,7 +85,9 @@ enum {
         BUTTON_POPUP_IMPORT_GPASMAN,
         BUTTON_POPUP_IMPORT_PWSAFE,
-        BUTTON_POPUP_IMPORT_CSV,
 #ifdef CONFIG_KWALLETIF
-        BUTTON_POPUP_IMPORT_KWALLET,
+        BUTTON_POPUP_IMPORT_CSV,
+        BUTTON_POPUP_IMPORT_KWALLET
+#else
+        BUTTON_POPUP_IMPORT_CSV
 #endif
 };
@@ -94,5 +98,5 @@ enum {
         BUTTON_TOOL_SAVEAS,
         BUTTON_TOOL_PRINT,
-        BUTTON_TOOL_LOCKDOC,
+        BUTTON_TOOL_LOCKDOC
 };
 


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