removed dead code

2 files changed, 27 insertions, 28 deletions

diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index c511661..66d26d6 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -725,10 +725,10 @@ void PwM::editPwd_slot3(const QString *category, const int *index,
                 if (!doc->editEntry(curCategory, w.getCategory(),
                                          curEntryIndex, &currItem)) {
                         KMessageBox::error(this,
                                            i18n("Couldn't edit the entry.\n"
-                                                "Maybe you changed the category and "
-                                                "this entry is already present in the new "
+                                                "Maybe you changed the category and\n"
+                                                "this entry is already present\nin the new "
                                                 "category?"),
                                            i18n("couldn't edit entry."));
                         doc->timer()->putLock(DocTimer::id_autoLockTimer);
                         return;
@@ -914,9 +914,9 @@ void PwM::exportToText()
         PwMerror ret = curDoc()->exportToText(&fn);
         if (ret != e_success) {
                 KMessageBox::error(this,
                                    i18n("Error: Couldn't write to file.\n"
-                                        "Please check if you have permission to write "
+                                        "Please check if you have permission to write\n"
                                         "to the file in that directory."),
                                    i18n("error while writing"));
         } else
                 showStatMsg(i18n("Successfully exported data."));
@@ -926,11 +926,11 @@ void PwM::exportToText()
 bool PwM::importFromText()
 {
         if (!isVirgin()) {
                 if (KMessageBox::questionYesNo(this,
-                                               i18n("Do you want to import the data "
-                                                    "into the current document? (If you "
-                                                    "select \"no\", a new document will be "
+                                               i18n("Do you want to import the data\n"
+                                                    "into the current document? (If you\n"
+                                                    "select \"no\", a new document will be\n"
                                                     "opened.)"),
                                                i18n("import into this document?"))
                     == KMessageBox::No) {
                         // import the data to a new window.
@@ -955,9 +955,9 @@ bool PwM::importFromText()
         ret = curDoc()->importFromText(&path, 0);
         if (ret == e_fileFormat) {
                 KMessageBox::error(this,
                                    i18n("Could not read file-format.\n"
-                                        "This seems to be _not_ a valid file "
+                                        "This seems to be _not_ a valid file\n"
                                         "exported by PwM."),
                                    i18n("invalid file-format"));
                 goto cancelImport;
         } else if (ret == e_invalidArg) {
@@ -965,9 +965,9 @@ bool PwM::importFromText()
                 goto cancelImport;
         } else if (ret != e_success) {
                 KMessageBox::error(this,
                                    i18n("Could not import file!\n"
-                                        "Do you have permission to read this file? "
+                                        "Do you have permission to read this file?\n"
                                         "Do you have enough free memory?"),
                                    i18n("import failed"));
                 goto cancelImport;
         }
@@ -1048,11 +1048,11 @@ void PwM::exportToKWallet()
 bool PwM::importFromGpasman()
 {
         if (!isVirgin()) {
                 if (KMessageBox::questionYesNo(this,
-                                               i18n("Do you want to import the data "
-                                                    "into the current document? (If you "
-                                                    "select \"no\", a new document will be "
+                                               i18n("Do you want to import the data\n"
+                                                    "into the current document? (If you\n"
+                                                    "select \"no\", a new document will be\n"
                                                     "opened.)"),
                                                i18n("import into this document?"))
                     == KMessageBox::No) {
                         // import the data to a new window.
@@ -1075,13 +1075,13 @@ bool PwM::importFromGpasman()
         ret = curDoc()->importFromGpasman(&path);
         if (ret == e_wrongPw) {
                 if (KMessageBox::questionYesNo(this,
                                                 i18n
-                                               ("This is probably the wrong master-password"
+                                               ("This is probably the wrong master-password\n"
                                                 "you have typed in.\n"
-                                                "There is no real way to determine the "
-                                                "correctness of the password in the Gpasman "
-                                                "file-format. But I think this "
+                                                "There is no real way to determine the\n"
+                                                "correctness of the password in the Gpasman\n"
+                                                "file-format. But I think this\n"
                                                 "password ist wrong.\n"
                                                 "Do you want to continue nevertheless?"),
                                                i18n("password error"))
                     == KMessageBox::No) {
diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp
index 8869f3a..86b6273 100644
--- a/pwmanager/pwmanager/pwmdoc.cpp
+++ b/pwmanager/pwmanager/pwmdoc.cpp
@@ -1263,13 +1263,16 @@ bool PwMDoc::compressDta(string *d, char algo)
         switch (algo) {
                 case PWM_COMPRESS_GZIP: {
                         CompressGzip comp;
                         return comp.compress(d);
-                                /*US    } case PWM_COMPRESS_BZIP2: {
+                }
+#ifndef PWM_EMBEDDED 
+                case PWM_COMPRESS_BZIP2: {
                         CompressBzip2 comp;
                         return comp.compress(d);
-*/
-                } case PWM_COMPRESS_NONE: {
+                }
+#endif
+                case PWM_COMPRESS_NONE: {
                         return true;
                 } default: {
                         BUG();
                 }
@@ -1283,13 +1286,16 @@ bool PwMDoc::decompressDta(string *d, char algo)
         switch (algo) {
                 case PWM_COMPRESS_GZIP: {
                         CompressGzip comp;
                         return comp.decompress(d);
-                                /*US    } case PWM_COMPRESS_BZIP2: {
+                }
+#ifndef PWM_EMBEDDED 
+                case PWM_COMPRESS_BZIP2: {
                         CompressBzip2 comp;
                         return comp.decompress(d);
-                        */
-                } case PWM_COMPRESS_NONE: {
+                }
+#endif
+                case PWM_COMPRESS_NONE: {
                         return true;
                 }
         }
         return false;
@@ -3122,17 +3128,14 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
                         inRemote->meta.update = modifiedSync;
 
                         //first check if we have a matching category in the local file
                         const string* remotecat = syncRemote->getCategory(catRemote);
-                        //US                        syncRemote->insertAddressee( inRemote, false );
-                        //US                        syncLocal->insertAddressee( inRemote, false );
                         syncLocal->addEntry(remotecat->c_str(), inRemote, true, false);
 
                         ++addedPasswordsLocal;
                     } else {
                         // pending checkExternSyncAddressee(addresseeRSyncSharp, inR);
                         syncRemote->delEntry(catRemote, indexRemote, true);
-                        //USsyncRemote->removeAddressee( inRemote );
                         ++deletedPasswordsRemote; 
                     }
             }
 
@@ -3162,9 +3165,8 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
         if ( inRemote == 0 ) { 
                 if ( inLocal->meta.update < mLastSync && mode != 4 ) {
                     // pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
                     syncLocal->delEntry(catLocal, indexLocal, true);
-                        //USsyncLocal->removeAddressee( inLocal );
                     ++deletedPasswordsLocal; 
                 } else {
                     if ( ! manager->mWriteBackExistingOnly ) {
                         ++addedPasswordsRemote; 
@@ -3172,9 +3174,8 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
 
                         //first check if we have a matching category in the remote file
                         const string* localcat = syncLocal->getCategory(catLocal);
 
-                        //USsyncLocal->insertAddressee( inLocal, false );
                         PwMDataItem newEntry;
                         newEntry = *inLocal; 
                         inRemote = &newEntry;
         
@@ -3219,10 +3220,8 @@ int PwMDoc::takePwMDataItem( PwMDataItem* local,  PwMDataItem* remote, QDateTime
     // 3 cancel 
     QDateTime localMod = local->meta.update;
     QDateTime remoteMod = remote->meta.update;
 
-    //US    QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice();
-
      if ( localMod == remoteMod )
        return 0;
         
     qDebug(" %d %d conflict on %s %s ", mode, full, local->desc.c_str(), remote->desc.c_str() );