summaryrefslogtreecommitdiffstats
path: root/kregexpeditor
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:50:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:50:20 -0600
commitaef5eada7f51ee48f3d21448db290bd8f06953a8 (patch)
tree9d6e7572ebcc27e402501d6966f9b46361a1702c /kregexpeditor
parent95d05392f9bc01594738a1e06ebf23123b3d3e6e (diff)
downloadtdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.tar.gz
tdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kregexpeditor')
-rw-r--r--kregexpeditor/kregexpeditorprivate.cpp2
-rw-r--r--kregexpeditor/regexpbuttons.cpp4
-rw-r--r--kregexpeditor/userdefinedregexps.cpp2
-rw-r--r--kregexpeditor/util.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/kregexpeditor/kregexpeditorprivate.cpp b/kregexpeditor/kregexpeditorprivate.cpp
index 08e661e..269e8e5 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 = KGlobal::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") ), KIcon::Toolbar );
#endif
_error = new TQLabel( this );
_error->setPixmap( pix );
diff --git a/kregexpeditor/regexpbuttons.cpp b/kregexpeditor/regexpbuttons.cpp
index 2c2b247..b450d84 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 = KGlobal::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") ), KIcon::Toolbar );
#endif
_selectBut->setPixmap( pix );
@@ -158,7 +158,7 @@ DoubleClickButton* RegExpButtons::insert(RegExpType tp, const char* name, TQStri
TQPixmap pix;
pix.convertFromImage( qembed_findImage( TQString::fromLatin1( name ) ) );
#else
- TQPixmap pix = KGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/")+TQString::fromLatin1(name) +
+ TQPixmap pix = TDEGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/")+TQString::fromLatin1(name) +
TQString::fromLatin1(".png") ), KIcon::Toolbar );
#endif
diff --git a/kregexpeditor/userdefinedregexps.cpp b/kregexpeditor/userdefinedregexps.cpp
index 89e0bb1..16f191f 100644
--- a/kregexpeditor/userdefinedregexps.cpp
+++ b/kregexpeditor/userdefinedregexps.cpp
@@ -70,7 +70,7 @@ void UserDefinedRegExps::slotPopulateUserRegexps()
TQStringList dirs;
dirs << TQString::fromLatin1( "predefined" );
#else
- TQStringList dirs = KGlobal::dirs()->findDirs( "data", TQString::fromLocal8Bit("kregexpeditor/predefined/") );
+ TQStringList dirs = TDEGlobal::dirs()->findDirs( "data", TQString::fromLocal8Bit("kregexpeditor/predefined/") );
#endif
for ( TQStringList::iterator it1 = dirs.begin(); it1 != dirs.end(); ++it1 ) {
diff --git a/kregexpeditor/util.cpp b/kregexpeditor/util.cpp
index a57f99c..bfcd0fe 100644
--- a/kregexpeditor/util.cpp
+++ b/kregexpeditor/util.cpp
@@ -26,7 +26,7 @@ TQPixmap Util::getKRegExpEditorIcon( const TQString& name )
pix.convertFromImage( qembed_findImage(name) );
return pix;
#else
- return KGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/") +name ),
+ return TDEGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/") +name ),
KIcon::Toolbar );
#endif
}