1 files changed, 23 insertions, 28 deletions

diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index 6ff05ac..ca3ff52 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -860,126 +860,126 @@ void ZSafe::findPwd()
        dialog->NameField->setText(lastSearchedName);
     else
        dialog->NameField->setText("");
     if (lastSearchedUsername)
        dialog->UsernameField->setText(lastSearchedUsername);
     else
        dialog->UsernameField->setText("");
     if (lastSearchedComment)
        dialog->CommentField->setText(lastSearchedComment);
     else
        dialog->CommentField->setText("");
     DialogCode result = (DialogCode) dialog->exec();
 #ifdef DESKTOP
        result = Accepted;
 #endif
 
     QString name;
     QString username;
     QString comment;
     if (result == Accepted)
     {
        name = dialog->NameField->text();
        username = dialog->UsernameField->text();
        comment = dialog->CommentField->text();
-       qWarning (name);
+       owarn << name << oendl;
     }
     else
     {
        delete dialog;
        return;
     }
 
     if (!name.isEmpty() && name != lastSearchedName ||
         lastSearchedName.isEmpty() && !name.isEmpty())
     {
        // set search at the beginning if a new name is given
        lastSearchedCategory = NULL;
        lastSearchedItem = NULL;
     }
     lastSearchedName = name;
     if (!username.isEmpty() && username != lastSearchedUsername ||
         lastSearchedUsername.isEmpty() && !username.isEmpty())
     {
        // set search at the beginning if a new name is given
        lastSearchedCategory = NULL;
        lastSearchedItem = NULL;
     }
     lastSearchedUsername = username;
     if (!comment.isEmpty() && comment != lastSearchedComment ||
         lastSearchedComment.isEmpty() && !comment.isEmpty())
     {
        // set search at the beginning if a new name is given
        lastSearchedCategory = NULL;
        lastSearchedItem = NULL;
     }
     lastSearchedComment = comment;
 
     ListView->clearSelection();
 
     bool found=FALSE;
     // step through all categories
     QListViewItem *i;
     if (lastSearchedCategory)
        i = lastSearchedCategory;
      else
        i = ListView->firstChild();
     for (;
          i != NULL;
          i = i->nextSibling())
     {
-       qWarning (i->text(0));
+       owarn << i->text(0) << oendl;
        i->setSelected(FALSE);
 
        // step through all subitems
        QListViewItem *si;
        if (lastSearchedItem)
           si = lastSearchedItem;
        else
           si = i->firstChild();
        // for (si = i->firstChild();
        for (;
             si != NULL;
             si = si->nextSibling())
        {
-          qWarning (si->text(0));
+          owarn << si->text(0) << oendl;
           if (si->isSelected())
              si->setSelected(FALSE);
           // ListView->repaintItem(si);
 
           bool n=TRUE;
           bool u=TRUE;
           bool c=TRUE;
           if (!name.isEmpty())
              n = (si->text(0)).contains (name, FALSE);
           if (!username.isEmpty())
              u = (si->text(1)).contains (username, FALSE);
           if (!comment.isEmpty())
              c = (si->text(3)).contains (comment, FALSE);
 
           if ((n && u && c ) && !found)
           {
-             qWarning ("Found");
+             owarn << "Found" << oendl;
              selectedItem = si;
              si->setSelected(TRUE);
              ListView->setCurrentItem(si);
              ListView->ensureItemVisible(si);
              ListView->triggerUpdate();
 
              lastSearchedCategory = i;
              // set to the next item
              lastSearchedItem = si->nextSibling();
              if (!lastSearchedItem)
              {
                 // no next item within category -> set next category
                 lastSearchedCategory = i->nextSibling();
                 if (!lastSearchedCategory)
                    lastSearchedItem = NULL; // END
              }
 
              found = TRUE;
              delete dialog;
              update();
              return;
           }
        }
        lastSearchedCategory = i->nextSibling();
@@ -1207,224 +1207,221 @@ void ZSafe::removeAsciiFile()
                        QString::null,
                        mimeTypes,
                        this,
                        tr ("Remove text file"));
 #else
   QString fn = ScQtFileEdit::getOpenFileName(this,
                        tr ("Remove text file"),
                        QDir::homeDirPath() + "/Documents/application/zsafe",
                        "*.txt");
 #endif
 #else
   QString fn = QFileDialog::getOpenFileName(
                 QDir::homeDirPath() + "/Documents/application/zsafe",
                     "ZSafe (*.txt)",
                     this,
                     "ZSafe File Dialog"
                     "Choose a text file" );
 #endif
 
   if (fn && fn.length() > 0 )
   {
     QFile f( fn );
     if ( !f.remove() )
     {
-        qWarning( QString("Could not remove file %1").arg(fn),
-                      2000 );
+        owarn << "Could not remove file " << fn << oendl;
         QMessageBox::critical( 0, tr("ZSafe"),
                   tr("Could not remove text file.") );
         return;
     }
   }
 }
 
 void ZSafe::writeAllEntries()
 {
    if (filename.isEmpty())
    {
        QMessageBox::critical( 0, tr("ZSafe"),
          tr("No document defined.\nYou have to create a new document"));
        return;
    }
 
    // open the file dialog
 #ifndef DESKTOP
 #ifndef NO_OPIE
    QMap<QString, QStringList> mimeTypes;
    mimeTypes.insert(tr("All"), QStringList() );
    mimeTypes.insert(tr("Text"), "text/*" );
    QString fn = OFileDialog::getSaveFileName( OFileSelector::EXTENDED_ALL,
                        QDir::homeDirPath() + "/Documents/application/zsafe",
                        QString::null,
                        mimeTypes,
                        this,
                        tr ("Export text file"));
 #else
    QString fn = ScQtFileEdit::getSaveAsFileName(this,
                        tr ("Export text file"),
                        QDir::homeDirPath() + "/Documents/application/zsafe",
                        "*.txt");
 #endif
 #else
    QString fn = QFileDialog::getSaveFileName(
                 QDir::homeDirPath() + "/Documents/application/zsafe",
                     "ZSafe (*.txt)",
                     this,
                     "ZSafe File Dialog"
                     "Choose a text file" );
 #endif
 
    // open the new document
    if (fn && fn.length() > 0 )
    {
     QFile f( fn );
     if ( !f.open( IO_WriteOnly ) ) {
-        qWarning( QString("Could not write to file %1").arg(fn),
-                      2000 );
+        owarn << "Could not write to file " << fn << oendl;
         QMessageBox::critical( 0, "ZSafe",
                   QString("Could not export to text file.") );
         return;
     }
     QTextStream t( &f );
 
     QListViewItem *i;
     // step through all categories
     for (i = ListView->firstChild();
          i != NULL;
          i = i->nextSibling())
     {
        // step through all subitems
        QListViewItem *si;
        for (si = i->firstChild();
             si != NULL;
             si = si->nextSibling())
        {
           QString oneEntry;
           oneEntry += "\"";
           oneEntry += i->text(0);
           oneEntry += "\";";
           oneEntry += "\"";
           oneEntry += si->text(0);
           oneEntry += "\";";
           oneEntry += "\"";
           oneEntry += si->text(1);
           oneEntry += "\";";
           oneEntry += "\"";
           oneEntry += si->text(2);
           oneEntry += "\";";
           oneEntry += "\"";
           QString comment = si->text(3);
           comment.replace (QRegExp("\n"), "<br>");
           oneEntry += comment;
           oneEntry += "\";";
           oneEntry += "\"";
           oneEntry += si->text(4);
           oneEntry += "\";";
           oneEntry += "\"";
           oneEntry += si->text(5);
           oneEntry += "\"";
-          // qWarning (oneEntry);
+          // owarn << oneEntry << oendl;
           t << oneEntry << endl;
 
-          // qWarning (si->text(0));
+          // owarn << si->text(0) << oendl;
        }
     }
     f.close();
    }
 }
 
 void ZSafe::readAllEntries()
 {
    if (filename.isEmpty())
    {
        QMessageBox::critical( 0, tr("ZSafe"),
          tr("No document defined.\nYou have to create a new document"));
        return;
    }
 
   // open the file dialog
 #ifndef DESKTOP
 #ifndef NO_OPIE
    QMap<QString, QStringList> mimeTypes;
    mimeTypes.insert(tr("All"), QStringList() );
    mimeTypes.insert(tr("Text"), "text/*" );
    QString fn = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL,
                        QDir::homeDirPath() + "/Documents/application/zsafe",
                        QString::null,
                        mimeTypes,
                        this,
                        tr ("Import text file"));
 #else
   QString fn = ScQtFileEdit::getOpenFileName(this,
                        tr ("Import text file"),
                        QDir::homeDirPath() + "/Documents/application/zsafe",
                        "*.txt");
 #endif
 #else
   QString fn = QFileDialog::getOpenFileName(
                 QDir::homeDirPath() + "/Documents/application/zsafe",
                     "ZSafe (*.txt)",
                     this,
                     "ZSafe File Dialog"
                     "Choose a text file" );
 #endif
 
   if (fn && fn.length() > 0 )
   {
    QFile f( fn );
    if ( !f.open( IO_ReadOnly ) )
    {
-      qWarning( QString("Could not read file %1").arg(fn),
-                      2000 );
+      owarn << "Could not read file " << fn << oendl;
       QMessageBox::critical( 0, "ZSafe",
                   QString("Could not import text file.") );
       return;
    }
 
    modified = true;
 
    // clear the password list
    selectedItem = NULL;
    QListViewItem *i;
    // step through all categories
    for (i = ListView->firstChild();
         i != NULL;
         i = i->nextSibling())
    {
       // step through all subitems
       QListViewItem *si;
       for (si = i->firstChild();
            si != NULL; )
            // si = si->nextSibling())
       {
           QListViewItem *_si = si;
           si = si->nextSibling();
           i->takeItem(_si); // remove from view list
           if (_si) delete _si;
       }
    }
 
-   qWarning ("ReadAllEntries(): ");
+   owarn << "ReadAllEntries(): " << oendl;
 
    QTextStream t(&f);
    while ( !t.eof() )
    {
       QString s = t.readLine();
       s.replace (QRegExp("\";\""), "\"|\"");
       // char buffer[1024];
 #ifndef WIN32
       char buffer[s.length()+1];
 #else
       char buffer[4048];
 #endif
 
 
       /* modify QString -> QCString::utf8 */
 
       strcpy (buffer, s.utf8());
 
       QString name;
       QString user;
       QString password;
       QString comment;
       QString field5="";
       QString field6="";
@@ -1533,133 +1530,131 @@ void ZSafe::readAllEntries()
             c1->setIcon (*getPredefinedIcon(category));
          }
          c1->setListItem (catI);
          c1->initListItem();
          categories.insert (c1->getCategoryName(), c1);
       }
 
    }
    f.close();
 
   }
   else
   {
   }
 
 }
 
 #ifdef UNUSED
 void ZSafe::writeAllEntries()
 {
     // open the file for writing
     QString fn = filename + ".txt";
     QFile f( fn );
     if ( !f.open( IO_WriteOnly ) ) {
-        qWarning( QString("Could not write to file %1").arg(fn),
-                      2000 );
+        owarn << "Could not write to file " << fn << oendl;
         QMessageBox::critical( 0, tr("ZSafe"),
                   tr("Could not export to text file.") );
         return;
     }
     QTextStream t( &f );
 
     QListViewItem *i;
     // step through all categories
     for (i = ListView->firstChild();
          i != NULL;
          i = i->nextSibling())
     {
        // step through all subitems
        QListViewItem *si;
        for (si = i->firstChild();
             si != NULL;
             si = si->nextSibling())
        {
           QString oneEntry;
           oneEntry += "\"";
           oneEntry += i->text(0);
           oneEntry += "\";";
           oneEntry += "\"";
           oneEntry += si->text(0);
           oneEntry += "\";";
           oneEntry += "\"";
           oneEntry += si->text(1);
           oneEntry += "\";";
           oneEntry += "\"";
           oneEntry += si->text(2);
           oneEntry += "\";";
           oneEntry += "\"";
           // oneEntry += si->text(3);
           QString comment = si->text(3);
           comment.replace (QRegExp("\n"), "<br>");
           oneEntry += comment;
           oneEntry += "\"";
-          // qWarning (oneEntry);
+          // owarn << oneEntry << oendl;
           t << oneEntry << endl;
 
-          // qWarning (si->text(0));
+          // owarn << si->text(0) << oendl;
        }
     }
     f.close();
 }
 
 void ZSafe::readAllEntries()
 {
    QString fn = filename + ".txt";
    QFile f( fn );
    if ( !f.open( IO_ReadOnly ) )
    {
-      qWarning( QString("Could not read file %1").arg(fn),
-                      2000 );
+      owarn << "Could not read file " << fn << oendl;
       QMessageBox::critical( 0, tr("ZSafe"),
                   tr("Could not import text file.") );
       return;
    }
 
    modified = true;
 
    // clear the password list
    selectedItem = NULL;
    QListViewItem *i;
    // step through all categories
    for (i = ListView->firstChild();
         i != NULL;
         i = i->nextSibling())
    {
       // step through all subitems
       QListViewItem *si;
       for (si = i->firstChild();
            si != NULL; )
            // si = si->nextSibling())
       {
           QListViewItem *_si = si;
           si = si->nextSibling();
           i->takeItem(_si); // remove from view list
           if (_si) delete _si;
       }
    }
 
-   qWarning ("ReadAllEntries(): ");
+   owarn << "ReadAllEntries(): " << oendl;
 
    QTextStream t(&f);
    while ( !t.eof() )
    {
       QString s = t.readLine();
       s.replace (QRegExp("\";\""), "\"|\"");
       // char buffer[1024];
       int len=s.length()+1;
 #ifdef WIN32
       char buffer[512];
 #else
       char buffer[len];
 #endif
       strcpy (buffer, s);
 
       QString name;
       QString user;
       QString password;
       QString comment;
 
       // separete the entries
       char *i = strtok (buffer, "|");
       QString category(&i[1]);
       category.truncate(category.length() -1);
@@ -1741,49 +1736,49 @@ void ZSafe::readAllEntries()
                QImage img = pix->convertToImage();
                pix->convertFromImage(img.smoothScale(14,14));
                c1->setIconName (icon);
                c1->setIcon (*pix);
                isIconAv = true;
             }
          }
          if (!isIconAv)
          {
             c1->setIcon (*getPredefinedIcon(category));
          }
          c1->setListItem (catI);
          c1->initListItem();
          categories.insert (c1->getCategoryName(), c1);
       }
 
    }
    f.close();
 
 }
 #endif // UNUSED
 
 void ZSafe::resume(int)
 {
-   qWarning ("Resume");
+   owarn << "Resume" << oendl;
    // hide the main window
 
    infoForm->hide();
    // open zsafe again
    m_password = "";
    selectedItem = NULL;
 
    // clear the password list
    QListViewItem *i;
    // step through all categories
    for (i = ListView->firstChild();
         i != NULL;
         i = i->nextSibling())
    {
       // step through all subitems
       QListViewItem *si;
       for (si = i->firstChild();
            si != NULL; )
       {
           QListViewItem *_si = si;
           si = si->nextSibling();
           i->takeItem(_si); // remove from view list
           if (_si) delete _si;
       }
@@ -1797,58 +1792,58 @@ void ZSafe::resume(int)
 
 
 bool ZSafe::openDocument(const char* _filename, const char* )
 {
      int retval;
      char* entry[FIELD_SIZE];
 // #ifndef WIN32
      int validationFlag = conf->readNumEntry(APP_KEY+"valzsafe", 1);
 // #else
      // int validationFlag = 1;
 // #endif
 
      int pwdOk = 0;
      int numberOfTries = 3;
      for (int i=0; i < numberOfTries; i++)
      {
         QFile f(_filename);
         if (f.exists())
         {
            // ask with a dialog for the password
        if (m_password.isEmpty())
           getDocPassword(tr("Enter Password"));
        if (m_password.isEmpty() && validationFlag == 0)
            {
-              qWarning ("Wrong password");
+              owarn << "Wrong password" << oendl;
               QMessageBox::critical( 0, tr("ZSafe"),
                   tr("Wrong password.\n\nZSafe will now exit.") );
               exitZs (1);
            }
 
        retval = loadInit(_filename, m_password);
        if (retval != PWERR_GOOD)
            {
-                qWarning ("Error loading Document");
+                owarn << "Error loading Document" << oendl;
         return false;
        }
         }
         else
         {
 #ifdef WIN32
            this->setCaption("Qt ZSafe");
 #else
            this->setCaption("ZSafe");
 #endif
            filename = "";
            return false;
         }
 
 
         // load the validation entry
         if (validationFlag == 0)
         {
             pwdOk = 1;
             break;
         }
 
     retval = loadEntry(entry);
         if (retval == 1 &&
@@ -2280,49 +2275,49 @@ bool ZSafe::saveDocument(const char* _filename,
         }
 
     if (saveFinalize() == PWERR_DATA) {
                 owarn << "2: Error writing file, contents not saved" << oendl;
         return false;
     } else {
 #ifndef DESKTOP
                 Global::statusMessage (tr("Password file saved."));
 #endif
                 modified = false;
         return true;
     }
 }
 
 PasswordForm *newPwdDialog;
 bool newPwdDialogResult = false;
 void ZSafe::setPasswordDialogDone()
 {
    newPwdDialogResult = true;
    newPwdDialog->close();
 }
 
 void ZSafe::getDocPassword(QString title)
 {
-qWarning ("getDocPassword");
+    owarn << "getDocPassword" << oendl;
     // open the 'Password' dialog
     PasswordForm *dialog = new PasswordForm(this, title, TRUE);
     newPwdDialog = dialog;
     newPwdDialogResult = false;
 
     connect( dialog->PasswordField, SIGNAL( returnPressed() ),
              this, SLOT( setPasswordDialogDone() ) );
 
     // CS: !!!
     // int pos = filename.findRev ('/');
     QString ti = filename.right (filename.length() - filename.findRev ('/') - 1);
 #ifdef WIN32
     dialog->setCaption("Qt " + ti);
 #else
     dialog->setCaption(ti);
 #endif
     // dialog->setCaption(title);
 
     dialog->PasswordField->setFocus();
     DialogCode result = (DialogCode) dialog->exec();
 #ifdef DESKTOP
        result = Accepted;
 #endif
 
@@ -2459,49 +2454,49 @@ int ZSafe::saveFinalize(void)
      * over, leaving us 3 short, so we fill it in with 3's.
      *
      * If we come out even, we fill it with 8 8s
      *
      * um, except that in this instance we are using 4 shorts instead of 8 bytes.
      * so, half everything
      */
     for (count1 = bufferIndex; count1 < 4; count1++) {
         plaintext[count1] = (4 - bufferIndex);
     }
     krc2->rc2_encrypt (plaintext);
     for (count1 = 0; count1 < 4; count1++) {
         ciphertext[count1] = iv[count1] ^ plaintext[count1];
         if (putc ((unsigned char) (ciphertext[count1] >> 8), fd) == EOF) retval = PWERR_DATA;
         if (putc ((unsigned char) (ciphertext[count1] & 0xff), fd) == EOF) retval = PWERR_DATA;
     }
 
     fclose (fd);
     free(buffer);
     return retval;
 }
 
 void ZSafe::quitMe ()
 {
-    qWarning ("QUIT...");
+    owarn << "QUIT..." << oendl;
 
     if (modified)
     {
       switch( QMessageBox::information( this, tr("ZSafe"),
                                       tr("Do you want to save\nbefore exiting?"),
                                       tr("&Save"),
                                       tr("S&ave with\nnew\npassword"),
                                       tr("&Don't Save"),
                                       0      // Enter == button 0
                                       ) )
       { // Escape == button 2
       case 0: // Save clicked, Alt-S or Enter pressed.
         // save
         modified = false;
         saveDocument(filename, FALSE);
         exitZs (1);
         break;
       case 1: //
         // Save with new password
         modified = false;
         saveDocument(filename, TRUE);
         exitZs (1);
         break;
       case 2: // Don't Save clicked or Alt-D pressed
@@ -2663,49 +2658,49 @@ void ZSafe::addCategory()
         waitDialog.hide();
            }
 
 #ifndef WIN32
         dialog->show();
 #endif
 #ifndef DESKTOP
         // dialog->move (20, 100);
 #endif
         DialogCode result = (DialogCode) dialog->exec();
 #ifdef DESKTOP
        result = Accepted;
 #endif
 
         QString category;
         QString icon;
         QString fullIconPath;
         QPixmap *pix;
         if (result == Accepted)
         {
            modified = true;
            category = dialog->CategoryField->currentText();
            icon = dialog->IconField->currentText()+".png";
 
-           qWarning (category);
+           owarn << category << oendl;
 
            QListViewItem *li = new ShadedListItem( 1, ListView );
            Category *c1 = new Category();
            c1->setCategoryName(category);
 
            // if (!icon.isEmpty() && !icon.isNull())
            if (icon != "predefined.png")
            {
                // build the full path
                fullIconPath = iconPath + icon;
                pix = new QPixmap (fullIconPath);
                // pix->resize(14, 14);
                if (pix)
                {
                   // save the full pixmap name into the config file
 // #ifndef WIN32
                   conf->writeEntry(APP_KEY+category, icon);
 // #endif
                   saveConf();
                   QImage img = pix->convertToImage();
                   pix->convertFromImage(img.smoothScale(14,14));
                   c1->setIcon (*pix);
                   c1->setIconName(icon);
                }
@@ -3171,49 +3166,49 @@ void ZSafe::editCategory()
                      // save the full pixmap name into the config file
 // #ifndef WIN32
                      conf->writeEntry(APP_KEY+category, icon);
 // #endif
                      saveConf();
                      QImage img = pix->convertToImage();
                      pix->convertFromImage(img.smoothScale(14,14));
                      cat->setIconName (icon);
                      cat->setIcon (*pix);
                   }
               }
               else
               {
 // #ifndef WIN32
                  conf->removeEntry (category);
 // #endif
                  saveConf();
                  cat->setIcon (*getPredefinedIcon(category));
               }
 
               // change the category name of the selected category
               QListViewItem *catItem = cat->getListItem();
               if (catItem)
               {
-                 qWarning (category);
+                 owarn << category << oendl;
                  catItem->setText( 0, tr( category ) );
                  cat->setCategoryName (tr(category));
 
                  cat->initListItem();
                  categories.insert (category, cat);
               }
            }
            saveCategoryDialogFields(dialog);
         }
         else
         {
            // delete dialog;
            dialog->hide();
            return;
         }
 
     }
 }
 
 void ZSafe::cutItem()
 {
     if (!selectedItem)
        return;
     if (!isCategory(selectedItem))
@@ -3572,49 +3567,49 @@ void ZSafe::setExpandFlag()
    file->setItemChecked('o', expandTree);
 #ifndef DESKTOP
    conf->setGroup ("zsafePrefs");
 #endif
 // #ifndef WIN32
    conf->writeEntry (APP_KEY+"expandTree", expandTree);
 // #endif
    saveConf();
 
 }
 
 void ZSafe::paintEvent( QPaintEvent * )
 {
    if (raiseFlag)
    {
       raiseFlag = false;
       raiseTimer.start (1, true);
       if (infoForm->isVisible())
          infoForm->raise();
    }
 }
 
 void ZSafe::resizeEvent ( QResizeEvent * )
 {
-   // qWarning ("resizeEvent");
+   // owarn << "resizeEvent" << oendl;
 #ifndef DESKTOP
    DeskW = appl->desktop()->width();
    DeskH = appl->desktop()->height();
 #else
    DeskW = this->width();
    DeskH = this->height();
 #endif
 
    if (New)
       New->setGeometry   ( QRect( DeskW-84, 2, 20, 20 ) );
    if (Edit)
       Edit->setGeometry  ( QRect( DeskW-64, 2, 20, 20 ) );
    if (Delete)
       Delete->setGeometry( QRect( DeskW-44, 2, 20, 20 ) );
    if (Find)
       Find->setGeometry  ( QRect( DeskW-24, 2, 20, 20 ) );
 }
 
 void ZSafe::slotRaiseTimer()
 {
    if (infoForm->isVisible())
       infoForm->raise();
    raiseFlag = true;
 }