From 29df04c24350cc76a41e2410d1c92445f9338b98 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:51:30 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kimagemapeditor/drawzone.cpp | 8 ++++---- kimagemapeditor/kimagemapeditor.cpp | 8 ++++---- kimagemapeditor/kimeshell.cpp | 12 ++++++------ kimagemapeditor/qextfileinfo.cpp | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) (limited to 'kimagemapeditor') diff --git a/kimagemapeditor/drawzone.cpp b/kimagemapeditor/drawzone.cpp index d6fdc2d1..f1648f97 100644 --- a/kimagemapeditor/drawzone.cpp +++ b/kimagemapeditor/drawzone.cpp @@ -141,16 +141,16 @@ DrawZone::DrawZone(TQWidget *parent,KImageMapEditor* _imageMapEditor) CircleCursor = TQCursor(b,b2,8,8); - TQString path = KGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/polygoncursor.png" ) + "kimagemapeditor/polygoncursor.png"; + TQString path = TDEGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/polygoncursor.png" ) + "kimagemapeditor/polygoncursor.png"; PolygonCursor = TQCursor(TQPixmap(path),8,8); - path = KGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/freehandcursor.png" ) + "kimagemapeditor/freehandcursor.png"; + path = TDEGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/freehandcursor.png" ) + "kimagemapeditor/freehandcursor.png"; FreehandCursor = TQCursor(TQPixmap(path),8,8); - path = KGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/addpointcursor.png" ) + "kimagemapeditor/addpointcursor.png"; + path = TDEGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/addpointcursor.png" ) + "kimagemapeditor/addpointcursor.png"; AddPointCursor = TQCursor(TQPixmap(path),8,8); - path = KGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/removepointcursor.png" ) + "kimagemapeditor/removepointcursor.png"; + path = TDEGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/removepointcursor.png" ) + "kimagemapeditor/removepointcursor.png"; RemovePointCursor = TQCursor(TQPixmap(path),8,8); } diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp index 7aa45ddb..1e31596d 100644 --- a/kimagemapeditor/kimagemapeditor.cpp +++ b/kimagemapeditor/kimagemapeditor.cpp @@ -159,7 +159,7 @@ KImageMapEditor::KImageMapEditor(TQWidget *parentWidget, const char *, // Shows the text: // "Drop an image or html file" -/* TQString path = KGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/dropimage.png" ) + "kimagemapeditor/dropimage.png"; +/* TQString path = TDEGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/dropimage.png" ) + "kimagemapeditor/dropimage.png"; if ( ! TQFileInfo(path).exists() ) { kdError() << "Couldn't find needed dropimage.png file in " "the data directory of KImageMapEditor.\n" @@ -843,8 +843,8 @@ TQImage KImageMapEditor::getBackgroundImage() { if ( _backgroundImage.isNull() ) { -// TQString filename = TQString("dropimage_")+KGlobal::locale()->language()+".png"; -// TQString path = TQString(); //KGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/"+filename ) + "kimagemapeditor/"+filename; +// TQString filename = TQString("dropimage_")+TDEGlobal::locale()->language()+".png"; +// TQString path = TQString(); //TDEGlobal::dirs()->findResourceDir( "data", "kimagemapeditor/"+filename ) + "kimagemapeditor/"+filename; // kdDebug() << "getBackgroundPic : loaded image : " << path << endl; // if ( ! TQFileInfo(path).exists() ) { @@ -928,7 +928,7 @@ TQImage KImageMapEditor::getBackgroundImage() { } - path = KGlobal::dirs()->saveLocation( "data", "kimagemapeditor/" ) +filename; + path = TDEGlobal::dirs()->saveLocation( "data", "kimagemapeditor/" ) +filename; kdDebug() << "getBackgroundPic : save new image to : " << path << endl; pix.save(path,"PNG",100); } diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp index 7005fe00..1cc8a867 100644 --- a/kimagemapeditor/kimeshell.cpp +++ b/kimagemapeditor/kimeshell.cpp @@ -248,12 +248,12 @@ void KimeShell::optionsConfigureToolbars() { #if defined(TDE_MAKE_VERSION) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) - saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); + saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else - saveMainWindowSettings(KGlobal::config() ); + saveMainWindowSettings(TDEGlobal::config() ); # endif #else - saveMainWindowSettings(KGlobal::config() ); + saveMainWindowSettings(TDEGlobal::config() ); #endif // use the standard toolbar editor @@ -267,12 +267,12 @@ void KimeShell::applyNewToolbarConfig() { #if defined(TDE_MAKE_VERSION) # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0) - applyMainWindowSettings(KGlobal::config(), autoSaveGroup()); + applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); # else - applyMainWindowSettings(KGlobal::config()); + applyMainWindowSettings(TDEGlobal::config()); # endif #else - applyMainWindowSettings(KGlobal::config()); + applyMainWindowSettings(TDEGlobal::config()); #endif } diff --git a/kimagemapeditor/qextfileinfo.cpp b/kimagemapeditor/qextfileinfo.cpp index 3d25bc61..5ef6d8d0 100644 --- a/kimagemapeditor/qextfileinfo.cpp +++ b/kimagemapeditor/qextfileinfo.cpp @@ -306,8 +306,8 @@ void QExtFileInfo::slotNewEntries(KIO::Job *job, const KIO::UDSEntryList& udsLis KURL url = static_cast(job)->url(); url.adjustPath(-1); // avoid creating these TQStrings again and again - static const TQString& dot = KGlobal::staticQString("."); - static const TQString& dotdot = KGlobal::staticQString(".."); + static const TQString& dot = TDEGlobal::staticQString("."); + static const TQString& dotdot = TDEGlobal::staticQString(".."); KIO::UDSEntryListConstIterator it = udsList.begin(); KIO::UDSEntryListConstIterator end = udsList.end(); -- cgit v1.2.1