diff options
| author | Darrell Anderson <[email protected]> | 2013-03-02 15:57:34 -0600 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2013-03-02 15:57:34 -0600 |
| commit | 7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch) | |
| tree | c76702a7f6310fbe9d437e347535422e836e94e9 /tdelfeditor/tdelfeditor.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 'tdelfeditor/tdelfeditor.cpp')
| -rw-r--r-- | tdelfeditor/tdelfeditor.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tdelfeditor/tdelfeditor.cpp b/tdelfeditor/tdelfeditor.cpp index a3ba789c5..1db2a3d8b 100644 --- a/tdelfeditor/tdelfeditor.cpp +++ b/tdelfeditor/tdelfeditor.cpp @@ -42,11 +42,11 @@ extern "C" { #include <tqstringlist.h> #include <tqfileinfo.h> -#include <kglobal.h> -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdeglobal.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <kiconloader.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kstandarddirs.h> /* return application name */ @@ -536,18 +536,18 @@ int main_console(int argc, char **argv) case MODE_TDE_AUTOADD_ICON: { printf("Searching for standard icon for name %s in the following directories:\n\r", argv[PARAM_ICON_NAME]); - KApplication::disableAutoDcopRegistration(); - KAboutData aboutd("tdelfeditor", "tdelfeditor", "0.0.1"); - KCmdLineArgs::init(&aboutd); - KApplication app(false, false); + TDEApplication::disableAutoDcopRegistration(); + TDEAboutData aboutd("tdelfeditor", "tdelfeditor", "0.0.1"); + TDECmdLineArgs::init(&aboutd); + TDEApplication app(false, false); - TQStringList rds = KGlobal::dirs()->resourceDirs("icon"); + TQStringList rds = TDEGlobal::dirs()->resourceDirs("icon"); for ( TQStringList::Iterator it = rds.begin(); it != rds.end(); ++it ) { printf(" * %s\n\r", (*it).ascii()); fflush(stdout); } - TQString systemIcon = KGlobal::iconLoader()->iconPath(argv[PARAM_ICON_NAME], 0, true); + TQString systemIcon = TDEGlobal::iconLoader()->iconPath(argv[PARAM_ICON_NAME], 0, true); if (systemIcon.isNull()) { - systemIcon = KGlobal::iconLoader()->iconPath(argv[PARAM_ICON_NAME], 0, false); + systemIcon = TDEGlobal::iconLoader()->iconPath(argv[PARAM_ICON_NAME], 0, false); printf("NOT FOUND, refusing to add unknown icon (this message is harmless)\n\r"); section = ICON_SECTION; clear_resource(handle, section); |