diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:30 -0600 |
| commit | 29df04c24350cc76a41e2410d1c92445f9338b98 (patch) | |
| tree | c2b9cde128e24275393a83d9eaec58b2ef12d109 /kxsldbg | |
| parent | c70534eef6085384ef7ddff369a154dbc8901917 (diff) | |
| download | tdewebdev-29df04c24350cc76a41e2410d1c92445f9338b98.tar.gz tdewebdev-29df04c24350cc76a41e2410d1c92445f9338b98.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kxsldbg')
| -rw-r--r-- | kxsldbg/kxsldbg.cpp | 4 | ||||
| -rw-r--r-- | kxsldbg/kxsldbgpart/libxsldbg/options.cpp | 4 | ||||
| -rw-r--r-- | kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/kxsldbg/kxsldbg.cpp b/kxsldbg/kxsldbg.cpp index deeea465..a9aa23f0 100644 --- a/kxsldbg/kxsldbg.cpp +++ b/kxsldbg/kxsldbg.cpp @@ -143,7 +143,7 @@ void KXsldbg::optionsConfigureKeys() void KXsldbg::optionsConfigureToolbars() { - saveMainWindowSettings(KGlobal::config(), "MainWindow"); + saveMainWindowSettings(TDEGlobal::config(), "MainWindow"); // use the standard toolbar editor KEditToolbar dlg(factory()); @@ -154,7 +154,7 @@ void KXsldbg::optionsConfigureToolbars() void KXsldbg::applyNewToolbarConfig() { - applyMainWindowSettings(KGlobal::config(), "MainWindow"); + applyMainWindowSettings(TDEGlobal::config(), "MainWindow"); } diff --git a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp index 492aba6a..525c3728 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp @@ -95,7 +95,7 @@ static TQString langLookupDir( const TQString &fname ) TQStringList search; // assemble the local search paths - TQStringList localDoc = KGlobal::dirs()->resourceDirs("html"); + TQStringList localDoc = TDEGlobal::dirs()->resourceDirs("html"); // also look in each of the TDEDIR paths TQString kdeDirs = getenv("TDEDIRS"); TQStringList kdeDirsList = TQStringList::split(":", kdeDirs); @@ -107,7 +107,7 @@ static TQString langLookupDir( const TQString &fname ) // look up the different languages for (uint id=0; id < localDoc.count(); id++) { - TQStringList langs = KGlobal::locale()->languageList(); + TQStringList langs = TDEGlobal::locale()->languageList(); langs.append( "en" ); langs.remove( "C" ); TQStringList::ConstIterator lang; diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp index 312fdb4e..d333c737 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp @@ -540,8 +540,8 @@ xsldbgMain(int argc, char **argv) if (args){ TQString langChoice = args->getOption("lang"); - if (KGlobal::locale() && !langChoice.isEmpty() && result) - KGlobal::locale()->setLanguage(langChoice); + if (TDEGlobal::locale() && !langChoice.isEmpty() && result) + TDEGlobal::locale()->setLanguage(langChoice); } #ifdef __riscos |