1 files changed, 11 insertions, 16 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
@@ -6,42 +6,44 @@
   License version 2 as published by the Free Software Foundation.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   Library General Public License for more details.
 
   You should have received a copy of the GNU Library General Public License
   along with this library; see the file COPYING.LIB.  If not, write to
   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
 */
+
 #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>
+#include <qpe/config.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qdir.h>
 #include <qpainter.h>
 #include <qbitmap.h>
-#include <stdlib.h> 
 #include <qstringlist.h>
 
-#include <stdio.h>
+/* STD */
+#include <stdlib.h>
 
 
 template class QIntCache<OThemePixmap>
 ;
 
 static const char *widgetEntries[] =
     { // unsunken widgets (see header)
         "PushButton", "ComboBox", "HSBarSlider", "VSBarSlider", "Bevel", "ToolButton",
         "ScrollButton", "HScrollDeco", "VScrollDeco", "ComboDeco", "MenuItem", "Tab",
         "ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight",
         // sunken widgets
         "PushButtonDown", "ComboBoxDown", "HSBarSliderDown", "VSBarSliderDown",
@@ -253,58 +255,51 @@ void OThemeBase::readConfig( Qt::GUIStyle /*style*/ )
 	QString pixnames[ WIDGETS ]; // used for duplicate check
 	QString brdnames[ WIDGETS ];
 	bool loaded[ WIDGETS ]; // used for preloading for CopyWidget
 
 	if ( configFileName.isEmpty() ) {
 		Config cfg ( "qpe" );
 		cfg. setGroup ( "Appearance" );
 	
 		configFileName = cfg. readEntry ( "Theme", "default" );
 	}
 	Config config( configFilePath + "/themes/" + configFileName + ".themerc" , Config::File );
 
-//	printf ( "Opened config file: %s\n", ( configFilePath + "/themes/" + configFileName + ".themerc" ). ascii());
-
 	// Are we initalized?
 	applyMiscResourceGroup( &config );
 	for ( i = 0; i < INHERIT_ITEMS; ++i ) {
 		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() );
 	}
 	for ( ; i < INHERIT_ITEMS*2; ++i ) {
 		if ( config.hasGroup( QString( widgetEntries[ i ] ) ) ) {
 			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() );
 		}
 		else {
 			copyfrom [ i ] = widgetEntries[ i - INHERIT_ITEMS ];
-//			printf ( "%d [%s]: copy=%s\n", i, widgetEntries [i], copyfrom [i].latin1());
 		}
 	}
 	for ( ; i < WIDGETS; ++i ) {
 		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() );
 	}
 
 	// initalize defaults that may not be read
 	for ( i = 0; i < WIDGETS; ++i )
 		loaded[ i ] = false;
 	btnXShift = btnYShift = focus3DOffset = 0;
 	aTabLine = iTabLine = true;
 	roundedButton = roundedCombo = roundedSlider = focus3D = false;
 	splitterWidth = 10;
 
 	for ( i = 0; i < WIDGETS; ++i ) {
 		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)" ));
 	}
 
 	// misc items
 	readMiscResourceGroup();
 
 	// Handle preblend items
 	for ( i = 0; i < PREBLEND_ITEMS; ++i ) {
 		if ( pixmaps[ preBlend[ i ] ] != NULL && blends[ preBlend[ i ] ] != 0.0 )
 			blend( preBlend[ i ] );
 	}
 }
 
@@ -398,25 +393,25 @@ OThemePixmap* OThemeBase::loadPixmap( QString &name )
 OThemePixmap* OThemeBase::scale( int w, int h, WidgetType widget )
 {
 	if ( scaleHints[ widget ] == FullScale ) {
 		if ( !pixmaps[ widget ] || pixmaps[ widget ] ->width() != w ||
 		        pixmaps[ widget ] ->height() != h ) {
 			OThemePixmap * cachePix = cache->pixmap( w, h, widget );
 			if ( cachePix ) {
 				cachePix = new OThemePixmap( *cachePix );
 				if ( pixmaps[ widget ] )
 					cache->insert( pixmaps[ widget ], OThemeCache::FullScale,
 					               widget );
 				else
-					qDebug( "We would have inserted a null pixmap!\n" );
+					odebug << "We would have inserted a null pixmap!\n" << oendl; 
 				pixmaps[ widget ] = cachePix;
 			}
 			else {
 				cache->insert( pixmaps[ widget ], OThemeCache::FullScale, widget );
 				QImage tmpImg = images[ widget ] ->smoothScale( w, h );
 				pixmaps[ widget ] = new OThemePixmap;
 				pixmaps[ widget ] ->convertFromImage( tmpImg );
 				if ( blends[ widget ] != 0.0 )
 					blend( widget );
 			}
 		}
 	}