diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:38:13 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:38:13 -0600 |
| commit | 4bb787f41f7cdefac2aac33ef59317b7157302c1 (patch) | |
| tree | c9726401d4eeb6fff8e78c4e35facb644c417e77 /kcalc | |
| parent | aef5eada7f51ee48f3d21448db290bd8f06953a8 (diff) | |
| download | tdeutils-4bb787f41f7cdefac2aac33ef59317b7157302c1.tar.gz tdeutils-4bb787f41f7cdefac2aac33ef59317b7157302c1.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcalc')
| -rw-r--r-- | kcalc/kcalc.cpp | 4 | ||||
| -rw-r--r-- | kcalc/kcalc_settings.kcfgc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp index 8e1b7d2..c3665c8 100644 --- a/kcalc/kcalc.cpp +++ b/kcalc/kcalc.cpp @@ -1809,11 +1809,11 @@ void KCalculator::showSettings() { // Check if there is already a dialog and if so bring // it to the foreground. - if(KConfigDialog::showDialog("settings")) + if(TDEConfigDialog::showDialog("settings")) return; // Create a new dialog with the same name as the above checking code. - KConfigDialog *dialog = new KConfigDialog(this, "settings", KCalcSettings::self()); + TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", KCalcSettings::self()); dialog->enableButtonSeparator( true ); // Add the general page. Store the settings in the General group and diff --git a/kcalc/kcalc_settings.kcfgc b/kcalc/kcalc_settings.kcfgc index 3dafab6..1ee30f0 100644 --- a/kcalc/kcalc_settings.kcfgc +++ b/kcalc/kcalc_settings.kcfgc @@ -3,6 +3,6 @@ File=kcalc.kcfg ClassName=KCalcSettings Singleton=true Mutators=ShowStat,ShowScientific,ShowLogic,ShowConstants,nameConstant,valueConstant -# Inherits=KConfigSkeleton +# Inherits=TDEConfigSkeleton # IncludeFiles=libtdepim/kpimprefs.h # MemberVariables=public |