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/applets/launcher/configdlg.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/applets/launcher/configdlg.cpp')
-rw-r--r-- | kicker/applets/launcher/configdlg.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kicker/applets/launcher/configdlg.cpp b/kicker/applets/launcher/configdlg.cpp index c35f0970c..94bb9c899 100644 --- a/kicker/applets/launcher/configdlg.cpp +++ b/kicker/applets/launcher/configdlg.cpp @@ -31,9 +31,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "configdlgbase.h" ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, Prefs *config, - int autoSize, KConfigDialog::DialogType dialogType, + int autoSize, TDEConfigDialog::DialogType dialogType, int dialogButtons) : - KConfigDialog(parent, name, config, dialogType, dialogButtons), + TDEConfigDialog(parent, name, config, dialogType, dialogButtons), m_settings(config), m_autoSize(autoSize) { @@ -57,7 +57,7 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, Prefs *config, void ConfigDlg::updateSettings() { kdDebug() << "updateSettings" << endl; - KConfigDialog::updateSettings(); + TDEConfigDialog::updateSettings(); if (!hasChanged()) { return; @@ -76,7 +76,7 @@ void ConfigDlg::updateSettings() void ConfigDlg::updateWidgets() { - KConfigDialog::updateWidgets(); + TDEConfigDialog::updateWidgets(); if (m_settings->iconDim() == m_autoSize) { m_ui->iconDim->setEditText(i18n("Automatic")); @@ -89,13 +89,13 @@ void ConfigDlg::updateWidgets() void ConfigDlg::updateWidgetsDefault() { - KConfigDialog::updateWidgetsDefault(); + TDEConfigDialog::updateWidgetsDefault(); } bool ConfigDlg::hasChanged() { return m_oldIconDimText != m_ui->iconDim->currentText() || - KConfigDialog::hasChanged(); + TDEConfigDialog::hasChanged(); } #include "configdlg.moc" |