diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
| commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
| tree | 7b7a01768b3781763186c825af21bb14717d2c32 /tdelfeditor/tdelfeditor.cpp | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdelfeditor/tdelfeditor.cpp')
| -rw-r--r-- | tdelfeditor/tdelfeditor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tdelfeditor/tdelfeditor.cpp b/tdelfeditor/tdelfeditor.cpp index 9868dbfca..7d58c9f08 100644 --- a/tdelfeditor/tdelfeditor.cpp +++ b/tdelfeditor/tdelfeditor.cpp @@ -541,13 +541,13 @@ int main_console(int argc, char **argv) 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); |