From 2b37df4ca0c9bae516c4fa00579584d6e3fcfd27 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:12:31 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- src/gui/itemselector.cpp | 4 ++-- src/gui/settingsdlg.cpp | 18 +++++++++--------- src/gui/settingsdlg.h | 4 ++-- src/gui/symbolviewer.cpp | 4 ++-- src/gui/symbolviewer.h | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src/gui') diff --git a/src/gui/itemselector.cpp b/src/gui/itemselector.cpp index 89f5bb2..fbc4cf1 100644 --- a/src/gui/itemselector.cpp +++ b/src/gui/itemselector.cpp @@ -133,7 +133,7 @@ void ItemSelector::addItem( const TQString & caption, const TQString & id, const void ItemSelector::writeOpenStates() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup( name() ); const TQStringList::iterator end = m_categories.end(); @@ -149,7 +149,7 @@ void ItemSelector::writeOpenStates() bool ItemSelector::readOpenState( const TQString &id ) { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup( name() ); return config->readBoolEntry( id+"IsOpen", true ); diff --git a/src/gui/settingsdlg.cpp b/src/gui/settingsdlg.cpp index 3fd5a28..c267fc4 100644 --- a/src/gui/settingsdlg.cpp +++ b/src/gui/settingsdlg.cpp @@ -40,8 +40,8 @@ // Make sure that this value is the same as that in ktechlab.kcfg const int defaultRefreshRate = 50; -SettingsDlg::SettingsDlg( TQWidget *parent, const char *name, KConfigSkeleton *config ) - : KConfigDialog( parent, name, config ) +SettingsDlg::SettingsDlg( TQWidget *parent, const char *name, TDEConfigSkeleton *config ) + : TDEConfigDialog( parent, name, config ) { m_generalOptionsWidget = new GeneralOptionsWidget( this, "generalOptionsWidget" ); m_gpasmSettingsWidget = new GpasmSettingsWidget( this, "gpasmSettingsWidget" ); @@ -93,7 +93,7 @@ void SettingsDlg::show() { KComboBox * combo = m_picProgrammerConfigWidget->kcfg_PicProgrammerProgram; combo->setEditable( true ); - KConfigDialog::show(); + TDEConfigDialog::show(); combo->setEditable( false ); } @@ -280,9 +280,9 @@ int SettingsDlg::sliderValueToRefreshRate( int sliderValue ) void SettingsDlg::updateSettings() { - KConfig * config = kapp->config(); + TDEConfig * config = kapp->config(); - KConfigSkeleton::ItemInt *item = dynamic_cast(KTLConfig::self()->findItem( "RefreshRate" )); + TDEConfigSkeleton::ItemInt *item = dynamic_cast(KTLConfig::self()->findItem( "RefreshRate" )); if ( !item ) return; @@ -306,9 +306,9 @@ void SettingsDlg::updateSettings() void SettingsDlg::slotUpdateSettings() { - KConfig * config = kapp->config(); + TDEConfig * config = kapp->config(); - KConfigSkeleton::ItemString * item = dynamic_cast(KTLConfig::self()->findItem( "PicProgrammerProgram" )); + TDEConfigSkeleton::ItemString * item = dynamic_cast(KTLConfig::self()->findItem( "PicProgrammerProgram" )); if ( !item ) return; @@ -369,7 +369,7 @@ void SettingsDlg::updateWidgetsDefault() bool SettingsDlg::hasChanged() { if ( sliderValueToRefreshRate( m_generalOptionsWidget->refreshRateSlider->value() ) == KTLConfig::refreshRate() ) - return KConfigDialog::hasChanged(); + return TDEConfigDialog::hasChanged(); return true; } @@ -377,7 +377,7 @@ bool SettingsDlg::hasChanged() bool SettingsDlg::isDefault() { if ( sliderValueToRefreshRate( m_generalOptionsWidget->refreshRateSlider->value() ) == defaultRefreshRate ) - return KConfigDialog::isDefault(); + return TDEConfigDialog::isDefault(); return false; } diff --git a/src/gui/settingsdlg.h b/src/gui/settingsdlg.h index f43f224..0abf212 100644 --- a/src/gui/settingsdlg.h +++ b/src/gui/settingsdlg.h @@ -26,12 +26,12 @@ class SDCCOptionsWidget; /** @author David Saxton */ -class SettingsDlg : public KConfigDialog +class SettingsDlg : public TDEConfigDialog { Q_OBJECT public: - SettingsDlg( TQWidget *parent, const char *name, KConfigSkeleton *config ); + SettingsDlg( TQWidget *parent, const char *name, TDEConfigSkeleton *config ); ~SettingsDlg(); static int refreshRateToSliderValue( int refreshRate ); diff --git a/src/gui/symbolviewer.cpp b/src/gui/symbolviewer.cpp index 170880b..719618e 100644 --- a/src/gui/symbolviewer.cpp +++ b/src/gui/symbolviewer.cpp @@ -106,7 +106,7 @@ SymbolViewer::~SymbolViewer() } -void SymbolViewer::saveProperties( KConfig * config ) +void SymbolViewer::saveProperties( TDEConfig * config ) { TQString oldGroup = config->group(); @@ -117,7 +117,7 @@ void SymbolViewer::saveProperties( KConfig * config ) } -void SymbolViewer::readProperties( KConfig * config ) +void SymbolViewer::readProperties( TDEConfig * config ) { TQString oldGroup = config->group(); diff --git a/src/gui/symbolviewer.h b/src/gui/symbolviewer.h index 56d599d..78c0140 100644 --- a/src/gui/symbolviewer.h +++ b/src/gui/symbolviewer.h @@ -51,12 +51,12 @@ class SymbolViewer : public TQWidget * Write the current properties (such as currently selected radix) to * the config. */ - void saveProperties( KConfig * config ); + void saveProperties( TDEConfig * config ); /** * Reads the properties (such as the last selected radix) from the * config file. */ - void readProperties( KConfig * config ); + void readProperties( TDEConfig * config ); void setContext( GpsimProcessor * gpsim ); /** -- cgit v1.2.1