1 files changed, 10 insertions, 15 deletions

diff --git a/noncore/styles/theme/othemebase.cpp b/noncore/styles/theme/othemebase.cpp
index 62b3a11..7ce4e5a 100644
--- a/noncore/styles/theme/othemebase.cpp
+++ b/noncore/styles/theme/othemebase.cpp
@@ -17,11 +17,13 @@
 */
+
 #include "othemebase.h"
 #include "ogfxeffect.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/qpeapplication.h> 
-//#include <kdebug.h>
-//#include <klocale.h>
 #include <qpe/config.h> 
-//#include <kglobal.h>
-//#include <kglobalsettings.h>
-//#include <kstddirs.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qfile.h>
@@ -31,6 +33,6 @@
 #include <qbitmap.h>
-#include <stdlib.h> 
 #include <qstringlist.h>
 
-#include <stdio.h>
+/* STD */
+#include <stdlib.h>
 
@@ -264,4 +266,2 @@ void OThemeBase::readConfig( Qt::GUIStyle /*style*/ )
 
-        //printf ( "Opened config file: %s\n", ( configFilePath + "/themes/" + configFileName + ".themerc" ). ascii());
-
         // Are we initalized?
@@ -270,3 +270,2 @@ void OThemeBase::readConfig( Qt::GUIStyle /*style*/ )
                         applyResourceGroup( &config, i, copyfrom, pixnames, brdnames );         
-        //      printf ( "%d [%s]: copy=%s, pix=%s, brd=%s\n", i, widgetEntries [i], copyfrom [i].latin1(), pixnames[i].latin1(),brdnames[i].latin1() );
         }
@@ -275,3 +274,2 @@ void OThemeBase::readConfig( Qt::GUIStyle /*style*/ )
                         applyResourceGroup( &config, i, copyfrom, pixnames, brdnames );
-        //              printf ( "%d [%s]: copy=%s, pix=%s, brd=%s\n", i, widgetEntries [i], copyfrom [i].latin1(), pixnames[i].latin1(),brdnames[i].latin1() );
                 }
@@ -279,3 +277,2 @@ void OThemeBase::readConfig( Qt::GUIStyle /*style*/ )
                         copyfrom [ i ] = widgetEntries[ i - INHERIT_ITEMS ];
-        //              printf ( "%d [%s]: copy=%s\n", i, widgetEntries [i], copyfrom [i].latin1());
                 }
@@ -284,3 +281,2 @@ void OThemeBase::readConfig( Qt::GUIStyle /*style*/ )
                 applyResourceGroup( &config, i, copyfrom, pixnames, brdnames );
-        //      printf ( "%d [%s]: copy=%s, pix=%s, brd=%s\n", i, widgetEntries [i], copyfrom [i].latin1(), pixnames[i].latin1(),brdnames[i].latin1() );
         }
@@ -297,3 +293,2 @@ void OThemeBase::readConfig( Qt::GUIStyle /*style*/ )
                 readResourceGroup( i, copyfrom, pixnames, brdnames, loaded );
-        //      printf ( "%d [%s]: copy=%s, pix=%s, brd=%s, colors=%s\n", i, widgetEntries [i], copyfrom [i].latin1(), pixnames[i].latin1(),brdnames[i].latin1(), (colors[i]?colors[i]->background().name().latin1():"<none)" ));
         }
@@ -409,3 +404,3 @@ OThemePixmap* OThemeBase::scale( int w, int h, WidgetType widget )
                                 else
-                                        qDebug( "We would have inserted a null pixmap!\n" );
+                                        odebug << "We would have inserted a null pixmap!\n" << oendl; 
                                 pixmaps[ widget ] = cachePix;