From 34ec7cf1e70300eb43f3822ce3261893f9f8ace6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:19:04 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- kregexpeditor/kregexpeditorprivate.cpp | 2 +- kregexpeditor/regexpbuttons.cpp | 4 ++-- kregexpeditor/util.cpp | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'kregexpeditor') diff --git a/kregexpeditor/kregexpeditorprivate.cpp b/kregexpeditor/kregexpeditorprivate.cpp index 269e8e5..147e348 100644 --- a/kregexpeditor/kregexpeditorprivate.cpp +++ b/kregexpeditor/kregexpeditorprivate.cpp @@ -174,7 +174,7 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name) #ifdef TQT_ONLY TQPixmap pix( "icons/error.png" ); #else - TQPixmap pix = TDEGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/error.png") ), KIcon::Toolbar ); + TQPixmap pix = TDEGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/error.png") ), TDEIcon::Toolbar ); #endif _error = new TQLabel( this ); _error->setPixmap( pix ); diff --git a/kregexpeditor/regexpbuttons.cpp b/kregexpeditor/regexpbuttons.cpp index b450d84..62500c8 100644 --- a/kregexpeditor/regexpbuttons.cpp +++ b/kregexpeditor/regexpbuttons.cpp @@ -53,7 +53,7 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name ) TQPixmap pix; pix.convertFromImage( qembed_findImage( "select" ) ); #else - TQPixmap pix = TDEGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/select.png") ), KIcon::Toolbar ); + TQPixmap pix = TDEGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/select.png") ), TDEIcon::Toolbar ); #endif _selectBut->setPixmap( pix ); @@ -159,7 +159,7 @@ DoubleClickButton* RegExpButtons::insert(RegExpType tp, const char* name, TQStri pix.convertFromImage( qembed_findImage( TQString::fromLatin1( name ) ) ); #else TQPixmap pix = TDEGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/")+TQString::fromLatin1(name) + - TQString::fromLatin1(".png") ), KIcon::Toolbar ); + TQString::fromLatin1(".png") ), TDEIcon::Toolbar ); #endif DoubleClickButton* but = new DoubleClickButton( pix, this, "RegExpButtons::but"); diff --git a/kregexpeditor/util.cpp b/kregexpeditor/util.cpp index bfcd0fe..dedccfc 100644 --- a/kregexpeditor/util.cpp +++ b/kregexpeditor/util.cpp @@ -27,7 +27,7 @@ TQPixmap Util::getKRegExpEditorIcon( const TQString& name ) return pix; #else return TDEGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/") +name ), - KIcon::Toolbar ); + TDEIcon::Toolbar ); #endif } @@ -38,8 +38,8 @@ TQPixmap Util::getSystemIcon( const TQString& name ) pix.convertFromImage( qembed_findImage( name ) ); return pix; #else - KIconLoader loader; - return loader.loadIcon( name, KIcon::Toolbar); + TDEIconLoader loader; + return loader.loadIcon( name, TDEIcon::Toolbar); #endif } @@ -51,8 +51,8 @@ TQIconSet Util::getSystemIconSet( const TQString& name ) pix.convertFromImage( qembed_findImage( name ) ); return TQIconSet( pix ); #else - KIconLoader loader; - return loader.loadIconSet( name, KIcon::Toolbar); + TDEIconLoader loader; + return loader.loadIconSet( name, TDEIcon::Toolbar); #endif } -- cgit v1.2.1