author | ar <ar> | 2004-05-31 15:26:50 (UTC) |
---|---|---|
committer | ar <ar> | 2004-05-31 15:26:50 (UTC) |
commit | 27dfc34d411dee76f09f5e516c60b0a64eb35948 (patch) (side-by-side diff) | |
tree | b7f7259497630390e352a1257cac5dc59f5399a6 /noncore/apps | |
parent | 27b09fe4f930b96e82cea9fb0eb1a9b87f7ec062 (diff) | |
download | opie-27dfc34d411dee76f09f5e516c60b0a64eb35948.zip opie-27dfc34d411dee76f09f5e516c60b0a64eb35948.tar.gz opie-27dfc34d411dee76f09f5e516c60b0a64eb35948.tar.bz2 |
- convert qWarning to owarn
-rw-r--r-- | noncore/apps/opie-write/qrichtext_p.h | 5 | ||||
-rw-r--r-- | noncore/apps/tableviewer/browsekeyentry.cpp | 11 | ||||
-rw-r--r-- | noncore/apps/tableviewer/db/common.cpp | 7 | ||||
-rw-r--r-- | noncore/apps/tableviewer/db/datacache.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/tableviewer/db/datacache.h | 12 | ||||
-rw-r--r-- | noncore/apps/tableviewer/ui/browsekeyentry.cpp | 9 | ||||
-rw-r--r-- | noncore/apps/tableviewer/ui/filterkeyentry.cpp | 8 | ||||
-rw-r--r-- | noncore/apps/tableviewer/ui/tvfilterview.cpp | 11 | ||||
-rw-r--r-- | noncore/apps/tinykate/libkate/kateconfig.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/zsafe/main.cpp | 15 | ||||
-rw-r--r-- | noncore/apps/zsafe/zlistview.cpp | 11 | ||||
-rw-r--r-- | noncore/apps/zsafe/zsafe.cpp | 51 |
12 files changed, 82 insertions, 64 deletions
diff --git a/noncore/apps/opie-write/qrichtext_p.h b/noncore/apps/opie-write/qrichtext_p.h index e368edb..3778feb 100644 --- a/noncore/apps/opie-write/qrichtext_p.h +++ b/noncore/apps/opie-write/qrichtext_p.h @@ -52,2 +52,5 @@ +#include <opie2/odebug.h> +using namespace Opie::Core; + #ifndef QT_H @@ -1885,3 +1888,3 @@ inline int QTextParagraph::paragId() const if ( id == -1 ) - qWarning( "invalid parag id!!!!!!!! (%p)", (void*)this ); + owarn << "invalid parag id!!!!!!!! (" << (void*)this << ")" << oendl; return id; diff --git a/noncore/apps/tableviewer/browsekeyentry.cpp b/noncore/apps/tableviewer/browsekeyentry.cpp index 04e7902..bab9af6 100644 --- a/noncore/apps/tableviewer/browsekeyentry.cpp +++ b/noncore/apps/tableviewer/browsekeyentry.cpp @@ -21,2 +21,7 @@ +/* OPIE */ +#include <opie2/odebug.h> +using namespace Opie::Core; + +/* QT */ #include <qtoolbutton.h> @@ -30,5 +35,2 @@ -//#include <iostream.h> -#include <qheader.h> -// For qWarning(const char *) @@ -230,4 +232,3 @@ void TVBrowseKeyEntry::searchOnText() default: - qWarning("TVBrowseKeyEntry::searchOnText() " - "cannot work out data type"); + owarn << "TVBrowseKeyEntry::searchOnText() cannot work out data type" << oendl; return; diff --git a/noncore/apps/tableviewer/db/common.cpp b/noncore/apps/tableviewer/db/common.cpp index b58af85..c35dbea 100644 --- a/noncore/apps/tableviewer/db/common.cpp +++ b/noncore/apps/tableviewer/db/common.cpp @@ -862,4 +862,3 @@ int KeyList::addKey(QString name, TVVariant::KeyType type) default: - qWarning(QObject::tr("KeyList::addKey() Cannot make default " - "value for type %1, Key not added.").arg(type)); + owarn << "KeyList::addKey() Cannot make default value for type " << type << ", Key not added." << oendl; break; @@ -1210,5 +1209,3 @@ void DataElem::setField(int i, QString q) default: - qWarning( - QObject::tr("DataElem::setField(%1, %2) No valid type found").arg(i).arg(q) - ); + owarn << "DataElem::setField(" << i << ", " << q << ") No valid type found" << oendl; } diff --git a/noncore/apps/tableviewer/db/datacache.cpp b/noncore/apps/tableviewer/db/datacache.cpp index 6380e1b..de57961 100644 --- a/noncore/apps/tableviewer/db/datacache.cpp +++ b/noncore/apps/tableviewer/db/datacache.cpp @@ -158,3 +158,3 @@ void DBStore::addItemInternal(DataElem *delem) { - /* if already full, don't over fill, do a qWarning though */ + /* if already full, don't over fill, do a owarn though */ if (full) { diff --git a/noncore/apps/tableviewer/db/datacache.h b/noncore/apps/tableviewer/db/datacache.h index c5dc637..e38050c 100644 --- a/noncore/apps/tableviewer/db/datacache.h +++ b/noncore/apps/tableviewer/db/datacache.h @@ -29,5 +29,11 @@ +#include "common.h" + +/* OPIE */ +#include <opie2/odebug.h> +using namespace Opie::Core; + +/* QT */ #include <qstring.h> #include <qvector.h> -#include "common.h" @@ -47,3 +53,3 @@ public: virtual bool openSource(QIODevice *) { - qWarning("DBAccess::openSource not yet implemented"); + owarn << "DBAccess::openSource not yet implemented" << oendl; return false; @@ -52,3 +58,3 @@ public: virtual bool saveSource(QIODevice *) { - qWarning("DBAccess::saveSource(QString) not yet implemented"); + owarn << "DBAccess::saveSource(QString) not yet implemented" << oendl; return false; diff --git a/noncore/apps/tableviewer/ui/browsekeyentry.cpp b/noncore/apps/tableviewer/ui/browsekeyentry.cpp index 42e24dd..6b78437 100644 --- a/noncore/apps/tableviewer/ui/browsekeyentry.cpp +++ b/noncore/apps/tableviewer/ui/browsekeyentry.cpp @@ -22,2 +22,5 @@ +#include <opie2/odebug.h> +using namespace Opie::Core; + #include <qtoolbutton.h> @@ -31,5 +34,2 @@ -#include <qheader.h> -// For qWarning(const char *) - /*! @@ -194,4 +194,3 @@ void TVBrowseKeyEntry::searchOnText() default: - qWarning("TVBrowseKeyEntry::searchOnText() " - "cannot work out data type"); + owarn << "TVBrowseKeyEntry::searchOnText() cannot work out data type" << oendl; return; diff --git a/noncore/apps/tableviewer/ui/filterkeyentry.cpp b/noncore/apps/tableviewer/ui/filterkeyentry.cpp index d108fbd..4d74d6b 100644 --- a/noncore/apps/tableviewer/ui/filterkeyentry.cpp +++ b/noncore/apps/tableviewer/ui/filterkeyentry.cpp @@ -22,2 +22,7 @@ +/* OPIE */ +#include <opie2/odebug.h> +using namespace Opie::Core; + +/* QT */ #include <qwidgetstack.h> @@ -202,4 +207,3 @@ TVVariant TVFilterKeyEntry::getCompareValue() sendkey = TVVariant(0); - qWarning("TVFilterKeyEntry::getCompareValue() " - "cannot work out data type"); + owarn << "TVFilterKeyEntry::getCompareValue() cannot work out data type" << oendl; } diff --git a/noncore/apps/tableviewer/ui/tvfilterview.cpp b/noncore/apps/tableviewer/ui/tvfilterview.cpp index 22f1fb7..198c8b5 100644 --- a/noncore/apps/tableviewer/ui/tvfilterview.cpp +++ b/noncore/apps/tableviewer/ui/tvfilterview.cpp @@ -20,2 +20,9 @@ #include "tvfilterview.h" + +/* OPIE */ +#include <opie2/odebug.h> +#include <qpe/qpeapplication.h> +using namespace Opie::Core; + +/* QT */ #include <qtoolbutton.h> @@ -28,3 +35,2 @@ -#include <qpe/qpeapplication.h> @@ -177,4 +183,3 @@ bool TVFilterView::passesFilter(DataElem *d) { default: - qWarning("TVFilterView::passesFilter() " - "unrecognized filter type"); + owarn << "TVFilterView::passesFilter() unrecognized filter type" << oendl; return false; diff --git a/noncore/apps/tinykate/libkate/kateconfig.cpp b/noncore/apps/tinykate/libkate/kateconfig.cpp index 782b629..4b8ce78 100644 --- a/noncore/apps/tinykate/libkate/kateconfig.cpp +++ b/noncore/apps/tinykate/libkate/kateconfig.cpp @@ -26,2 +26,3 @@ #include <qpe/global.h> +using namespace Opie::Core; @@ -558,4 +559,3 @@ void KateConfig::write( const QString &fn ) if ( rename( strNewFile, filename ) < 0 ) { - qWarning( "problem renaming the file %s to %s", strNewFile.latin1(), - filename.latin1() ); + owarn << "problem renaming the file " << strNewFile.latin1() << " to " << filename.latin1() << oendl; QFile::remove( strNewFile ); diff --git a/noncore/apps/zsafe/main.cpp b/noncore/apps/zsafe/main.cpp index 4fe319b..5f48f77 100644 --- a/noncore/apps/zsafe/main.cpp +++ b/noncore/apps/zsafe/main.cpp @@ -10,2 +10,8 @@ #include "zsafe.h" + +/* OPIE */ +#include <opie2/odebug.h> +using namespace Opie::Core; + +/* QT */ #ifdef DESKTOP @@ -15,2 +21,4 @@ #endif + +/* STD */ #include <stdio.h> @@ -76,5 +84,3 @@ int main( int argc, char ** argv ) - char buf[128]; - sprintf (buf, "Width: %d Height: %d\n", DeskW, DeskH); - qWarning (buf); + owarn << "Width: " << DeskW << " Height: " << DeskH << oendl; @@ -87,4 +93,3 @@ int main( int argc, char ** argv ) DeskH += 25; - sprintf (buf, "Changed width: %d Height: %d\n", DeskW, DeskH); - qWarning (buf); + owarn << "Changed width: " << DeskW << " Height: " << DeskH << oendl; } diff --git a/noncore/apps/zsafe/zlistview.cpp b/noncore/apps/zsafe/zlistview.cpp index ba02a15..7d0b8c2 100644 --- a/noncore/apps/zsafe/zlistview.cpp +++ b/noncore/apps/zsafe/zlistview.cpp @@ -5,5 +5,10 @@ #include "zlistview.h" -#include <stdio.h> #include "zsafe.h" +/* OPIE */ +//#include <opie2/odebug.h> + +/* STD */ +#include <stdio.h> + ZListView::ZListView (ZSafe *zsafe, const char *id) : QListView(zsafe, id) @@ -20,5 +25,3 @@ void ZListView::keyPressEvent ( QKeyEvent *e ) /* - char buf[64]; - sprintf (buf, "key: %d\n", e->key()); - qWarning (buf); + owarn << "key: " << e->key() << oendl; */ 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 @@ -883,3 +883,3 @@ void ZSafe::findPwd() comment = dialog->CommentField->text(); - qWarning (name); + owarn << name << oendl; } @@ -929,3 +929,3 @@ void ZSafe::findPwd() { - qWarning (i->text(0)); + owarn << i->text(0) << oendl; i->setSelected(FALSE); @@ -943,3 +943,3 @@ void ZSafe::findPwd() { - qWarning (si->text(0)); + owarn << si->text(0) << oendl; if (si->isSelected()) @@ -960,3 +960,3 @@ void ZSafe::findPwd() { - qWarning ("Found"); + owarn << "Found" << oendl; selectedItem = si; @@ -1230,4 +1230,3 @@ void ZSafe::removeAsciiFile() { - qWarning( QString("Could not remove file %1").arg(fn), - 2000 ); + owarn << "Could not remove file " << fn << oendl; QMessageBox::critical( 0, tr("ZSafe"), @@ -1280,4 +1279,3 @@ void ZSafe::writeAllEntries() 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", @@ -1324,6 +1322,6 @@ void ZSafe::writeAllEntries() oneEntry += "\""; - // qWarning (oneEntry); + // owarn << oneEntry << oendl; t << oneEntry << endl; - // qWarning (si->text(0)); + // owarn << si->text(0) << oendl; } @@ -1375,4 +1373,3 @@ void ZSafe::readAllEntries() { - qWarning( QString("Could not read file %1").arg(fn), - 2000 ); + owarn << "Could not read file " << fn << oendl; QMessageBox::critical( 0, "ZSafe", @@ -1405,3 +1402,3 @@ void ZSafe::readAllEntries() - qWarning ("ReadAllEntries(): "); + owarn << "ReadAllEntries(): " << oendl; @@ -1556,4 +1553,3 @@ void ZSafe::writeAllEntries() 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"), @@ -1595,6 +1591,6 @@ void ZSafe::writeAllEntries() oneEntry += "\""; - // qWarning (oneEntry); + // owarn << oneEntry << oendl; t << oneEntry << endl; - // qWarning (si->text(0)); + // owarn << si->text(0) << oendl; } @@ -1610,4 +1606,3 @@ void ZSafe::readAllEntries() { - qWarning( QString("Could not read file %1").arg(fn), - 2000 ); + owarn << "Could not read file " << fn << oendl; QMessageBox::critical( 0, tr("ZSafe"), @@ -1640,3 +1635,3 @@ void ZSafe::readAllEntries() - qWarning ("ReadAllEntries(): "); + owarn << "ReadAllEntries(): " << oendl; @@ -1764,3 +1759,3 @@ void ZSafe::resume(int) { - qWarning ("Resume"); + owarn << "Resume" << oendl; // hide the main window @@ -1820,3 +1815,3 @@ bool ZSafe::openDocument(const char* _filename, const char* ) { - qWarning ("Wrong password"); + owarn << "Wrong password" << oendl; QMessageBox::critical( 0, tr("ZSafe"), @@ -1829,3 +1824,3 @@ bool ZSafe::openDocument(const char* _filename, const char* ) { - qWarning ("Error loading Document"); + owarn << "Error loading Document" << oendl; return false; @@ -2303,3 +2298,3 @@ void ZSafe::getDocPassword(QString title) { -qWarning ("getDocPassword"); + owarn << "getDocPassword" << oendl; // open the 'Password' dialog @@ -2482,3 +2477,3 @@ void ZSafe::quitMe () { - qWarning ("QUIT..."); + owarn << "QUIT..." << oendl; @@ -2686,3 +2681,3 @@ void ZSafe::addCategory() - qWarning (category); + owarn << category << oendl; @@ -3194,3 +3189,3 @@ void ZSafe::editCategory() { - qWarning (category); + owarn << category << oendl; catItem->setText( 0, tr( category ) ); @@ -3595,3 +3590,3 @@ void ZSafe::resizeEvent ( QResizeEvent * ) { - // qWarning ("resizeEvent"); + // owarn << "resizeEvent" << oendl; #ifndef DESKTOP |