use the new Config::hasGroup method instead of a custom Config class

1 files changed, 1 insertions, 13 deletions

diff --git a/noncore/styles/theme/othemebase.cpp b/noncore/styles/theme/othemebase.cpp
index acac847..62b3a11 100644
--- a/noncore/styles/theme/othemebase.cpp
+++ b/noncore/styles/theme/othemebase.cpp
@@ -72,36 +72,24 @@ unsigned int height :
 	12;
 unsigned int border :
 	1;
 unsigned int mask :
 	1;
 };
 
 union kthemeKey{
 	kthemeKeyData data;
 	unsigned int cacheKey;
 };
 
-class MyConfig : public Config
-{
-public:
-	MyConfig ( const QString &f, Domain d ) : Config ( f, d )
-	{ }
-
-	bool hasGroup ( const QString &gname ) const
-	{
-		QMap< QString, ConfigGroup>::ConstIterator it = groups. find ( gname );
-		return ( it != groups.end() );
-	}
-};
 
 void OThemeBase::generateBorderPix( int i )
 {
 	// separate pixmap into separate components
 	if ( pbPixmaps[ i ] ) {
 		// evidently I have to do masks manually...
 		const QBitmap * srcMask = pbPixmaps[ i ] ->mask();
 		QBitmap destMask( pbWidth[ i ], pbWidth[ i ] );
 		QPixmap tmp( pbWidth[ i ], pbWidth[ i ] );
 
 		bitBlt( &tmp, 0, 0, pbPixmaps[ i ], 0, 0, pbWidth[ i ], pbWidth[ i ],
 		        Qt::CopyROP, false );
@@ -263,25 +251,25 @@ void OThemeBase::readConfig( Qt::GUIStyle /*style*/ )
 	QString tmpStr;
 	QString copyfrom[ WIDGETS ];
 	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" );
 	}
-	MyConfig config( configFilePath + "/themes/" + configFileName + ".themerc" , Config::File );
+	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 );