diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kicker/libkicker/global.cpp | |
| parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
| download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kicker/libkicker/global.cpp')
| -rw-r--r-- | kicker/libkicker/global.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp index 0527f8224..f300df3a2 100644 --- a/kicker/libkicker/global.cpp +++ b/kicker/libkicker/global.cpp @@ -196,7 +196,7 @@ TQString copyDesktopFile(const KURL& url) TQString file = newDesktopFile(url); KURL dest; dest.setPath(file); - KIO::NetAccess::upload(url.path(), dest, 0); + TDEIO::NetAccess::upload(url.path(), dest, 0); return file; } @@ -326,7 +326,7 @@ TQPoint popupPosition(KPanelApplet::Direction d, void colorize(TQImage& image) { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("WM"); TQColor color = TQApplication::palette().active().highlight(); TQColor activeTitle = config->readColorEntry("activeBackground", &color); |