diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
| commit | 703fb0c89c2eee56a1e613e67a446db9d4287929 (patch) | |
| tree | dd8c5ca66075cd89c2638a2b48cf78386a9870a7 /tdeui/ktoolbar.h | |
| parent | 818e7abec3d5d3809b6b77293558678371c16b71 (diff) | |
| download | tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/ktoolbar.h')
| -rw-r--r-- | tdeui/ktoolbar.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tdeui/ktoolbar.h b/tdeui/ktoolbar.h index 5fffdd592..2a86b0687 100644 --- a/tdeui/ktoolbar.h +++ b/tdeui/ktoolbar.h @@ -905,20 +905,20 @@ public: /** * Save the toolbar settings to group @p configGroup in @p config. */ - void saveSettings(KConfig *config, const TQString &configGroup); + void saveSettings(TDEConfig *config, const TQString &configGroup); /** * Read the toolbar settings from group @p configGroup in @p config * and apply them. Even default settings are re-applied if @p force is set. */ - void applySettings(KConfig *config, const TQString &configGroup,bool force); + void applySettings(TDEConfig *config, const TQString &configGroup,bool force); // KDE4 merge with force=false - void applySettings(KConfig *config, const TQString &configGroup); + void applySettings(TDEConfig *config, const TQString &configGroup); /* * Tell the toolbar what XML-GUI resource file it should use to save * it's state. The state of the toolbar (position, size, etc) is - * saved in KConfig files if the application does not use XML-GUI + * saved in TDEConfig files if the application does not use XML-GUI * but if the app does, then it's saved the XML file. This function * allows this to happen. * @@ -1090,7 +1090,7 @@ protected: void showEvent( TQShowEvent *e ); void resizeEvent( TQResizeEvent *e ); bool event( TQEvent *e ); - void applyAppearanceSettings(KConfig *config, const TQString &_configGroup, bool forceGlobal = false); + void applyAppearanceSettings(TDEConfig *config, const TQString &_configGroup, bool forceGlobal = false); TQString settingsGroup() const; private slots: |