diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
| commit | 7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch) | |
| tree | c76702a7f6310fbe9d437e347535422e836e94e9 /kate/part/katejscript.cpp | |
| parent | a2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff) | |
| parent | 27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff) | |
| download | tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'kate/part/katejscript.cpp')
| -rw-r--r-- | kate/part/katejscript.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp index 58b4dd163..cab335312 100644 --- a/kate/part/katejscript.cpp +++ b/kate/part/katejscript.cpp @@ -35,9 +35,9 @@ #include <kdebug.h> #include <kstandarddirs.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <kconfig.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdeconfig.h> #include <kjs/function_object.h> #include <kjs/interpreter.h> @@ -52,7 +52,7 @@ namespace KJS { -// taken from khtml +// taken from tdehtml // therefor thx to: // Copyright (C) 1999-2003 Harri Porten (porten@kde.org) // Copyright (C) 2001-2003 David Faure (faure@kde.org) @@ -642,7 +642,7 @@ void KateJScriptManager::collectScripts (bool force) return; // We'll store the scripts list in this config - KConfig config("katepartjscriptrc", false, false); + TDEConfig config("katepartjscriptrc", false, false); // figure out if the kate install is too new config.setGroup ("General"); @@ -653,7 +653,7 @@ void KateJScriptManager::collectScripts (bool force) } // Let's get a list of all the .js files - TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/scripts/*.js",false,true); + TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/scripts/*.js",false,true); // Let's iterate through the list and build the Mode List for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) @@ -685,10 +685,10 @@ void KateJScriptManager::collectScripts (bool force) if (dfi.exists()) { - KConfig df (desktopFile, true, false); + TDEConfig df (desktopFile, true, false); df.setDesktopGroup (); - // get cmdname, fallback to baseName, if it is empty, therefor not use the kconfig fallback + // get cmdname, fallback to baseName, if it is empty, therefor not use the tdeconfig fallback TQString cmdname = df.readEntry ("X-Kate-Command"); if (cmdname.isEmpty()) { @@ -778,7 +778,7 @@ bool KateJScriptManager::help( Kate::View *, const TQString &cmd, TQString &msg if (!m_scripts[cmd] || !m_scripts[cmd]->desktopFileExists) return false; - KConfig df (m_scripts[cmd]->desktopFilename(), true, false); + TDEConfig df (m_scripts[cmd]->desktopFilename(), true, false); df.setDesktopGroup (); msg = df.readEntry ("X-Kate-Help"); @@ -1016,7 +1016,7 @@ void KateIndentJScriptManager::collectScripts (bool force) // We'll store the scripts list in this config - KConfig config("katepartindentjscriptrc", false, false); + TDEConfig config("katepartindentjscriptrc", false, false); #if 0 // figure out if the kate install is too new config.setGroup ("General"); @@ -1028,7 +1028,7 @@ void KateIndentJScriptManager::collectScripts (bool force) #endif // Let's get a list of all the .js files - TQStringList list = KGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.js",false,true); + TQStringList list = TDEGlobal::dirs()->findAllResources("data","katepart/scripts/indent/*.js",false,true); // Let's iterate through the list and build the Mode List for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) |