-rw-r--r-- | core/settings/button/remapdlg.cpp | 16 | ||||
-rw-r--r-- | core/settings/citytime/citytime.cpp | 6 | ||||
-rw-r--r-- | core/settings/citytime/citytimebase.cpp | 10 | ||||
-rw-r--r-- | core/settings/citytime/zonemap.cpp | 12 | ||||
-rw-r--r-- | core/settings/launcher/doctabsettings.cpp | 6 | ||||
-rw-r--r-- | core/settings/launcher/inputmethodsettings.cpp | 6 | ||||
-rw-r--r-- | core/settings/launcher/tabdialog.cpp | 18 | ||||
-rw-r--r-- | core/settings/launcher/taskbarsettings.cpp | 22 | ||||
-rw-r--r-- | core/settings/light-and-power/light.cpp | 7 | ||||
-rw-r--r-- | core/settings/security/security.cpp | 8 | ||||
-rw-r--r-- | core/settings/security/security.pro | 2 | ||||
-rw-r--r-- | core/symlinker/main.cpp | 34 | ||||
-rw-r--r-- | core/symlinker/symlinker.pro | 2 | ||||
-rw-r--r-- | core/tools/quicklauncher/main.cpp | 19 |
14 files changed, 111 insertions, 57 deletions
diff --git a/core/settings/button/remapdlg.cpp b/core/settings/button/remapdlg.cpp index 4effebc..cadb955 100644 --- a/core/settings/button/remapdlg.cpp +++ b/core/settings/button/remapdlg.cpp @@ -1,8 +1,14 @@ + +#include "remapdlg.h" +#include "buttonutils.h" + +/* OPIE */ +#include <opie2/odebug.h> + +/* QT */ #include <qlistview.h> #include <qcombobox.h> #include <qtimer.h> -#include "remapdlg.h" -#include "buttonutils.h" @@ -109,14 +115,14 @@ void RemapDlg::itemChanged ( QListViewItem *it ) { m_msg = m = OQCopMessage ( "ignore", 0 ); - qDebug ("***ignoring"); + odebug << "***ignoring" << oendl; } else if ( it == m_map_preset ) { m_msg = m = m_msg_preset; - qDebug ("***Preset"); + odebug << "***Preset" << oendl; } else if ( it && !it-> childCount ( ) ) { - qDebug ("***Custom: %s %s ",it-> text ( 1 ). latin1 ( ), it-> text ( 2 ). latin1 ( )); + odebug << "***Custom: " << it-> text ( 1 ). latin1 ( ) << " " << it-> text ( 2 ). latin1 ( ) << oendl; enabled = ( it == m_map_custom ); m_msg = m = OQCopMessage ( it-> text ( 1 ). latin1 ( ), it-> text ( 2 ). latin1 ( )); diff --git a/core/settings/citytime/citytime.cpp b/core/settings/citytime/citytime.cpp index 721285d..d73bda1 100644 --- a/core/settings/citytime/citytime.cpp +++ b/core/settings/citytime/citytime.cpp @@ -24,4 +24,5 @@ #include "citytime.h" +/* OPIE */ #include <qpe/qpeapplication.h> #include <qpe/config.h> @@ -30,5 +31,7 @@ #include <qpe/qcopenvelope_qws.h> #endif +#include <opie2/odebug.h> +/* QT */ #include <qlabel.h> #include <qmessagebox.h> @@ -36,4 +39,5 @@ #include <qlayout.h> +/* STD */ #include <stdlib.h> @@ -47,5 +51,5 @@ CityTime::CityTime( QWidget *parent, const char* name, config.setGroup( "Time" ); bWhichClock = config.readBoolEntry( "AMPM", TRUE ); - qDebug( QString("%1").arg(bWhichClock) ); + odebug << QString("%1").arg(bWhichClock) << oendl; frmMap->changeClock( bWhichClock ); diff --git a/core/settings/citytime/citytimebase.cpp b/core/settings/citytime/citytimebase.cpp index 323929b..77cb91d 100644 --- a/core/settings/citytime/citytimebase.cpp +++ b/core/settings/citytime/citytimebase.cpp @@ -4,8 +4,12 @@ #include "citytimebase.h" +#include "zonemap.h" + +/* OPIE */ +#include <opie2/odebug.h> +/* QT */ #include <qlabel.h> #include <qtoolbutton.h> -#include "zonemap.h" #include <qlayout.h> #include <qwhatsthis.h> @@ -402,10 +406,10 @@ bool CityTimeBase::event( QEvent* ev ) void CityTimeBase::beginNewTz() { - qWarning( "CityTimeBase::beginNewTz(): Not implemented yet!" ); + owarn << "CityTimeBase::beginNewTz(): Not implemented yet!" << oendl; } void CityTimeBase::slotNewTz(const QString &, const QString &) { - qWarning( "CityTimeBase::slotNewTz(const QString &, const QString &): Not implemented yet!" ); + owarn << "CityTimeBase::slotNewTz(const QString &, const QString &): Not implemented yet!" << oendl; } diff --git a/core/settings/citytime/zonemap.cpp b/core/settings/citytime/zonemap.cpp index b6843d2..e4a25ef 100644 --- a/core/settings/citytime/zonemap.cpp +++ b/core/settings/citytime/zonemap.cpp @@ -24,7 +24,10 @@ #include "zonemap.h" +/* OPIE */ #include <qpe/resource.h> #include <qpe/qpeapplication.h> +#include <opie2/odebug.h> +/* QT */ #include <qfile.h> #include <qlabel.h> @@ -38,4 +41,5 @@ #include <qwhatsthis.h> +/* STD */ #include <limits.h> @@ -131,8 +135,8 @@ ZoneField::ZoneField( const QString& strLine ) void ZoneField::showStructure( void ) const { - qDebug( "Country: %s", strCountry.latin1() ); - qDebug( "City: %s", strCity.latin1() ); - qDebug( "x: %d", _x ); - qDebug( "y: %d\n", _y ); + odebug << "Country: " << strCountry << "" << oendl; + odebug << "City: " << strCity << "" << oendl; + odebug << "x: " << _x << "" << oendl; + odebug << "y: " << _y << "\n" << oendl; } diff --git a/core/settings/launcher/doctabsettings.cpp b/core/settings/launcher/doctabsettings.cpp index 179a7f9..dfdc9be 100644 --- a/core/settings/launcher/doctabsettings.cpp +++ b/core/settings/launcher/doctabsettings.cpp @@ -29,6 +29,9 @@ #include "doctabsettings.h" +/* OPIE */ #include <qpe/config.h> +#include <opie2/odebug.h> +/* QT */ #include <qcheckbox.h> #include <qlayout.h> @@ -36,4 +39,5 @@ #include <qwhatsthis.h> + DocTabSettings::DocTabSettings( QWidget *parent, const char *name ):QWidget( parent, name ) { @@ -60,5 +64,5 @@ void DocTabSettings::appletChanged() void DocTabSettings::accept() { - qDebug( "DocTabSettings::accept()" ); + odebug << "DocTabSettings::accept()" << oendl; Config cfg( "Launcher" ); cfg.setGroup( "DocTab" ); diff --git a/core/settings/launcher/inputmethodsettings.cpp b/core/settings/launcher/inputmethodsettings.cpp index e342c09..0422075 100644 --- a/core/settings/launcher/inputmethodsettings.cpp +++ b/core/settings/launcher/inputmethodsettings.cpp @@ -29,6 +29,9 @@ #include "inputmethodsettings.h" +/* OPIE */ #include <qpe/config.h> +#include <opie2/odebug.h> +/* QT */ #include <qspinbox.h> #include <qcheckbox.h> @@ -37,4 +40,5 @@ #include <qwhatsthis.h> + InputMethodSettings::InputMethodSettings( QWidget *parent, const char *name ):QWidget( parent, name ) { @@ -74,5 +78,5 @@ void InputMethodSettings::appletChanged() void InputMethodSettings::accept() { - qDebug( "InputMethodSettings::accept()" ); + odebug << "InputMethodSettings::accept()" << oendl; Config cfg( "Launcher" ); cfg.setGroup( "InputMethods" ); diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp index 763b360..546e229 100644 --- a/core/settings/launcher/tabdialog.cpp +++ b/core/settings/launcher/tabdialog.cpp @@ -26,6 +26,15 @@ */ +#include "tabdialog.h" + +/* OPIE */ #include <qpe/resource.h> +#include <opie2/ofontselector.h> +#include <opie2/otabwidget.h> +#include <opie2/ocolorbutton.h> +#include <opie2/ofiledialog.h> +#include <opie2/odebug.h> +/* QT */ #include <qlayout.h> #include <qvbox.h> @@ -39,11 +48,4 @@ #include <qcheckbox.h> -#include <opie2/ofontselector.h> -#include <opie2/otabwidget.h> -#include <opie2/ocolorbutton.h> -#include <opie2/ofiledialog.h> - -#include "tabdialog.h" - using namespace Opie::Ui; @@ -149,5 +151,5 @@ public: case TabConfig::Image: { - qDebug( "Loading image: %s", val.latin1() ); + odebug << "Loading image: " << val << "" << oendl; QPixmap bg ( Resource::loadPixmap ( "wallpaper/" + val )); if ( bg. isNull ( )) { diff --git a/core/settings/launcher/taskbarsettings.cpp b/core/settings/launcher/taskbarsettings.cpp index 43886c9..8dd9e97 100644 --- a/core/settings/launcher/taskbarsettings.cpp +++ b/core/settings/launcher/taskbarsettings.cpp @@ -29,4 +29,5 @@ #include "taskbarsettings.h" +/* OPIE */ #include <qpe/config.h> #include <qpe/qlibrary.h> @@ -34,5 +35,7 @@ #include <qpe/taskbarappletinterface.h> #include <qpe/qcopenvelope_qws.h> +#include <opie2/odebug.h> +/* QT */ #include <qdir.h> #include <qlistview.h> @@ -42,4 +45,5 @@ #include <qwhatsthis.h> +/* STD */ #include <stdlib.h> @@ -86,10 +90,10 @@ void TaskbarSettings::init ( ) TaskbarNamedAppletInterface *iface = 0; - qWarning("Load applet: %s", (*it).latin1() ); + owarn << "Load applet: " << (*it) << "" << oendl; QLibrary *lib = new QLibrary ( path + "/" + *it ); lib-> queryInterface ( IID_TaskbarNamedApplet, (QUnknownInterface**) &iface ); - qWarning("<1>"); + owarn << "<1>" << oendl; if ( iface ) { - qWarning("<2>"); + owarn << "<2>" << oendl; QString lang = getenv( "LANG" ); QTranslator *trans = new QTranslator ( qApp ); @@ -104,13 +108,13 @@ void TaskbarSettings::init ( ) iface-> release ( ); } - qWarning("<3>"); + owarn << "<3>" << oendl; if ( !iface ) { - qWarning("<4>"); + owarn << "<4>" << oendl; lib-> queryInterface ( IID_TaskbarApplet, (QUnknownInterface**) &iface ); if ( iface ) { - qWarning("<5>"); + owarn << "<5>" << oendl; name = (*it). mid ( 3 ); - qWarning("Found applet: %s", name.latin1() ); + owarn << "Found applet: " << name << "" << oendl; #ifdef Q_OS_MACX int sep = name. find( ".dylib" ); @@ -127,8 +131,8 @@ void TaskbarSettings::init ( ) } } - qWarning("<6>"); + owarn << "<6>" << oendl; if ( iface ) { - qWarning("<7>"); + owarn << "<7>" << oendl; QCheckListItem *item; item = new QCheckListItem ( m_list, name, QCheckListItem::CheckBox ); diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp index d64a063..424a64c 100644 --- a/core/settings/light-and-power/light.cpp +++ b/core/settings/light-and-power/light.cpp @@ -30,5 +30,7 @@ #include "sensor.h" +/* OPIE */ #include <opie2/odevice.h> +#include <opie2/odebug.h> #include <qpe/config.h> @@ -38,4 +40,5 @@ #endif +/* QT */ #include <qlabel.h> #include <qcheckbox.h> @@ -234,5 +237,5 @@ void LightSettings::setContrast ( int contr ) void LightSettings::setFrequency ( int index ) { - qWarning("LightSettings::setFrequency(%d)", index); + owarn << "LightSettings::setFrequency(" << index << ")" << oendl; ODevice::inst ( )-> setCurrentCpuFrequency(index); } @@ -246,5 +249,5 @@ void LightSettings::resetBacklight ( ) void LightSettings::setCloseHingeAction ( int index ) { - qWarning("LightSettings::setCloseHingeStatus(%d)", index); + owarn << "LightSettings::setCloseHingeStatus(" << index << ")" << oendl; } diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp index 4eddb55..b917aea 100644 --- a/core/settings/security/security.cpp +++ b/core/settings/security/security.cpp @@ -20,4 +20,5 @@ #include "security.h" +/* OPIE */ #include <qpe/qpeapplication.h> #include <qpe/config.h> @@ -25,5 +26,7 @@ #include <qpe/qpedialog.h> #include <qpe/qcopenvelope_qws.h> +#include <opie2/odebug.h> +/* QT */ #include <qcheckbox.h> #include <qpushbutton.h> @@ -33,4 +36,7 @@ #include <qtextstream.h> + +using namespace Opie::Core; + Security::Security( QWidget* parent, const char* name, WFlags fl ) : SecurityBase( parent, name, TRUE, WStyle_ContextHelp ) @@ -258,5 +264,5 @@ void Security::selectNet(int auth_peer,int auth_peer_bits, bool update) } } - qDebug("No match for \"%s\"",sn.latin1()); + odebug << "No match for \"" << sn << "\"" << oendl; } diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro index 4a29ee2..4c1e68b 100644 --- a/core/settings/security/security.pro +++ b/core/settings/security/security.pro @@ -5,5 +5,5 @@ INTERFACES = securitybase.ui INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include -LIBS += -lqpe +LIBS += -lqpe -lopiecore2 TARGET = security diff --git a/core/symlinker/main.cpp b/core/symlinker/main.cpp index 6a04980..96e7f3c 100644 --- a/core/symlinker/main.cpp +++ b/core/symlinker/main.cpp @@ -1,2 +1,7 @@ + +/* OPIE */ +#include <opie2/odebug.h> + +/* QT */ #include <qapplication.h> #include <qfile.h> @@ -6,4 +11,5 @@ #include <qstringlist.h> +/* STD */ #include <stdlib.h> #include <unistd.h> //symlink() @@ -25,5 +31,5 @@ static void createSymlinks( const QString &location, const QString &package ) QFile outFile( listDir + package + ".list"); -// qDebug( "createSymlinks %s -> %s", inFile.name().ascii(), outFile.name().ascii() ); +// odebug << "createSymlinks " << inFile.name().ascii() << " -> " << outFile.name().ascii() << "" << oendl; @@ -36,19 +42,19 @@ static void createSymlinks( const QString &location, const QString &package ) while ( !in.eof() ) { // until end of file... s = in.readLine(); // line of text excluding '\n' -// qDebug( "Read: %s", s.ascii() ); +// odebug << "Read: " << s.ascii() << "" << oendl; if (s.find(location,0,true) >= 0){ -// qDebug( "Found!" ); +// odebug << "Found!" << oendl; s = s.replace(location,""); } -// qDebug( "Read after: %s", s.ascii() ); +// odebug << "Read after: " << s.ascii() << "" << oendl; // for s, do link/mkdir. if ( s.right(1) == "/" ) { -// qDebug("do mkdir for %s", s.ascii()); +// odebug << "do mkdir for " << s.ascii() << "" << oendl; mkdir( s.ascii(), 0777 ); //possible optimization: symlink directories //that don't exist already. -- Risky. } else { -// qDebug("do symlink for %s", s.ascii()); +// odebug << "do symlink for " << s.ascii() << "" << oendl; QFileInfo ffi( s ); //Don't try to symlink if a regular file exists already @@ -59,8 +65,8 @@ static void createSymlinks( const QString &location, const QString &package ) QString e=s.ascii(); e = e.replace(ffi.fileName(),""); -// qDebug("DirName : %s",e.ascii() ); +// odebug << "DirName : " << e.ascii() << "" << oendl; system ( QString("mkdir -p ")+e.ascii() ); if (symlink( (location+s).ascii(), s.ascii() ) != 0) - qDebug ("Big problem creating symlink and directory"); + odebug << "Big problem creating symlink and directory" << oendl; } } @@ -68,5 +74,5 @@ static void createSymlinks( const QString &location, const QString &package ) out << s << "\n"; } else { - qDebug( "%s exists already, not symlinked", s.ascii() ); + odebug << "" << s.ascii() << " exists already, not symlinked" << oendl; } } @@ -89,5 +95,5 @@ static void removeSymlinks( const QString &package ) while ( !in.eof() ) { // until end of file... s = in.readLine(); // line of text excluding '\n' -// qDebug("remove symlink %s", s.ascii()); +// odebug << "remove symlink " << s.ascii() << "" << oendl; QFileInfo ffi( s ); //Confirm that it's still a symlink. @@ -96,5 +102,5 @@ static void removeSymlinks( const QString &package ) // qDebug ( "Removed %s", s.ascii() );} // else -// qDebug( "Not removed %s", s.ascii() ); +// odebug << "Not removed " << s.ascii() << "" << oendl; } } @@ -132,5 +138,5 @@ static void updateSymlinks() QString info = root + "/usr/lib/ipkg/info"; QDir infoDir( info ); -// qDebug( "looking at %s", info.ascii() ); +// odebug << "looking at " << info.ascii() << "" << oendl; if ( infoDir.isReadable() ) { const QFileInfoList *packages = infoDir.entryInfoList( "*.list" ); // No tr @@ -140,5 +146,5 @@ static void updateSymlinks() ++it; if ( knownPackages.contains( fi->fileName() ) ) { -// qDebug( "found %s and we've seen it before", fi->fileName().latin1() ); +// odebug << "found " << fi->fileName() << " and we've seen it before" << oendl; knownPackages.remove( fi->fileName() ); } else { @@ -176,4 +182,4 @@ int main( int argc, char *argv[] ) removeSymlinks( argv[2] ); else - qWarning( "Argument error" ); + owarn << "Argument error" << oendl; } diff --git a/core/symlinker/symlinker.pro b/core/symlinker/symlinker.pro index f850d46..50ad785 100644 --- a/core/symlinker/symlinker.pro +++ b/core/symlinker/symlinker.pro @@ -10,5 +10,5 @@ TARGET = opie-update-symlinks INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include . -LIBS += -lqpe +LIBS += -lqpe -lopiecore2 include ( $(OPIEDIR)/include.pro ) diff --git a/core/tools/quicklauncher/main.cpp b/core/tools/quicklauncher/main.cpp index d467d6e..c2467fb 100644 --- a/core/tools/quicklauncher/main.cpp +++ b/core/tools/quicklauncher/main.cpp @@ -19,4 +19,10 @@ **********************************************************************/ +#include "dropins.h" + +/* OPIE */ +#include <opie2/odebug.h> + +/* QT */ #include <qpainter.h> #include <qstrlist.h> @@ -32,4 +38,6 @@ #include <qtopia/qpeapplication.h> #undef private + +/* STD */ #include <stdio.h> #include <stdlib.h> @@ -38,5 +46,4 @@ #include <unistd.h> -#include "dropins.h" using QuickPrivate::PluginLoader; @@ -112,5 +119,5 @@ public: } } else { - qWarning( "Could not create application main window" ); + owarn << "Could not create application main window" << oendl; exit(-1); } @@ -127,5 +134,5 @@ private slots: QStrList argList; stream >> argList; - qDebug( "QuickLauncher execute: %s", argList.at(0) ); + odebug << "QuickLauncher execute: " << argList.at(0) << "" << oendl; doQuickLaunch( argList ); delete this; @@ -135,5 +142,5 @@ private slots: QString arg; stream >> arg; - qDebug( "QuickLauncher execute: %s", arg.latin1() ); + odebug << "QuickLauncher execute: " << arg << "" << oendl; QStrList argList; argList.append( arg.utf8() ); @@ -181,5 +188,5 @@ int main( int argc, char** argv ) arg0 = arg0.mid( sep+1 ); if ( arg0 != "quicklauncher" ) { - qDebug( "QuickLauncher invoked as: %s", arg0.data() ); + odebug << "QuickLauncher invoked as: " << arg0.data() << "" << oendl; QuickLauncher::exec( argc, argv ); } else { @@ -207,5 +214,5 @@ int main( int argc, char** argv ) #endif (void)new QuickLauncher(); - qDebug( "QuickLauncher running" ); + odebug << "QuickLauncher running" << oendl; // Pre-load default fonts QFontMetrics fm( QApplication::font() ); |