diff options
| author | Timothy Pearson <[email protected]> | 2013-02-03 23:01:18 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-03 23:01:18 -0600 |
| commit | aa3abfa2a78cccfcb1f91d808753c79295d618e9 (patch) | |
| tree | fe00218b08a670818d7ee67e677d1f6b5ded6eed /kstyles/kthemestyle/kthemebase.cpp | |
| parent | e92a4e05c504978308b2dd83082d2727b74bea8f (diff) | |
| download | tdelibs-aa3abfa2a78cccfcb1f91d808753c79295d618e9.tar.gz tdelibs-aa3abfa2a78cccfcb1f91d808753c79295d618e9.zip | |
Rename KStyle to TDEStyle to avoid conflicts with KDE4
Diffstat (limited to 'kstyles/kthemestyle/kthemebase.cpp')
| -rw-r--r-- | kstyles/kthemestyle/kthemebase.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kstyles/kthemestyle/kthemebase.cpp b/kstyles/kthemestyle/kthemebase.cpp index 7ca3ffb06..adbf49084 100644 --- a/kstyles/kthemestyle/kthemebase.cpp +++ b/kstyles/kthemestyle/kthemebase.cpp @@ -423,7 +423,7 @@ void KThemeBase::readConfig( TQt::GUIStyle /*style*/ ) TQSettings config; if (configDirName.isEmpty() || configDirName == ".") { - KStyleDirs::dirs()->addToSearch( "themerc", config ); + TDEStyleDirs::dirs()->addToSearch( "themerc", config ); } else config.insertSearchPath( TQSettings::Unix, configDirName ); @@ -525,7 +525,7 @@ void KThemeBase::readConfig( TQt::GUIStyle /*style*/ ) } KThemeBase::KThemeBase( const TQString& dir, const TQString & configFile ) - : KStyle( FilledFrameWorkaround ), configFileName( configFile ) + : TDEStyle( FilledFrameWorkaround ), configFileName( configFile ) { d = new KThemeBasePrivate; if ( configFileName.isEmpty() ) @@ -648,7 +648,7 @@ KThemeBase::~KThemeBase() if ( grHighColors[ i ] ) delete( grHighColors[ i ] ); } - KStyleDirs::release(); + TDEStyleDirs::release(); delete cache; delete d; } @@ -656,7 +656,7 @@ KThemeBase::~KThemeBase() TQImage* KThemeBase::loadImage( const TQString &name ) { TQImage * image = new TQImage; - TQString path = KStyleDirs::dirs()->findResource( "themepixmap",name ); + TQString path = TDEStyleDirs::dirs()->findResource( "themepixmap",name ); image->load( path ); if ( !image->isNull() ) return ( image ); @@ -668,7 +668,7 @@ TQImage* KThemeBase::loadImage( const TQString &name ) KThemePixmap* KThemeBase::loadPixmap( const TQString &name ) { KThemePixmap * pixmap = new KThemePixmap( false ); - TQString path = KStyleDirs::dirs()->findResource( "themepixmap", name ); + TQString path = TDEStyleDirs::dirs()->findResource( "themepixmap", name ); pixmap->load( path ); if ( !pixmap->isNull() ) return pixmap; |