diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kicker/libkicker | |
| 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')
| -rw-r--r-- | kicker/libkicker/global.cpp | 4 | ||||
| -rw-r--r-- | kicker/libkicker/panelbutton.cpp | 2 | ||||
| -rw-r--r-- | kicker/libkicker/panelbutton.h | 6 |
3 files changed, 6 insertions, 6 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); diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp index 3ecc19dfd..e9481ea85 100644 --- a/kicker/libkicker/panelbutton.cpp +++ b/kicker/libkicker/panelbutton.cpp @@ -108,7 +108,7 @@ void PanelButton::configure() return; } - KConfigGroup tilesGroup( TDEGlobal::config(), "button_tiles" ); + TDEConfigGroup tilesGroup( TDEGlobal::config(), "button_tiles" ); if( !tilesGroup.readBoolEntry( "Enable" + name + "Tiles", true ) ) { setTile( TQString::null ); return; diff --git a/kicker/libkicker/panelbutton.h b/kicker/libkicker/panelbutton.h index 3a455a58f..b67bc2b9a 100644 --- a/kicker/libkicker/panelbutton.h +++ b/kicker/libkicker/panelbutton.h @@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "kickertip.h" class TQPopupMenu; -class KConfigGroup; +class TDEConfigGroup; class KShadowEngine; /** @@ -66,9 +66,9 @@ public: /** * Prompts the button to save it's configuration. Subclass specific - * settings should be saved in this method to the KConfigGroup passed in. + * settings should be saved in this method to the TDEConfigGroup passed in. */ - virtual void saveConfig(KConfigGroup&) const {} + virtual void saveConfig(TDEConfigGroup&) const {} /** * Reimplement this to display a properties dialog for your button. |