diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:49 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:37:49 -0600 |
commit | f8069e2ea048f2657cc417d83820576ec55c181b (patch) | |
tree | cbc5bf540866934a91e0f33b260fc7a25e191fad /cervisia/diffdlg.cpp | |
parent | e6aaa3624cc6179b82a9bfff1760e742a669064c (diff) | |
download | tdesdk-f8069e2ea048f2657cc417d83820576ec55c181b.tar.gz tdesdk-f8069e2ea048f2657cc417d83820576ec55c181b.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'cervisia/diffdlg.cpp')
-rw-r--r-- | cervisia/diffdlg.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cervisia/diffdlg.cpp b/cervisia/diffdlg.cpp index 993f4f6c..bdf34841 100644 --- a/cervisia/diffdlg.cpp +++ b/cervisia/diffdlg.cpp @@ -41,7 +41,7 @@ #include "diffview.h" -DiffDialog::DiffDialog(KConfig& cfg, TQWidget *parent, const char *name, bool modal) +DiffDialog::DiffDialog(TDEConfig& cfg, TQWidget *parent, const char *name, bool modal) : KDialogBase(parent, name, modal, TQString(), Close | Help | User1, Close, true, KStdGuiItem::saveAs()) , partConfig(cfg) @@ -118,7 +118,7 @@ DiffDialog::DiffDialog(KConfig& cfg, TQWidget *parent, const char *name, bool mo TQSize size = configDialogSize(partConfig, "DiffDialog"); resize(size); - KConfigGroupSaver cs(&partConfig, "DiffDialog"); + TDEConfigGroupSaver cs(&partConfig, "DiffDialog"); syncbox->setChecked(partConfig.readBoolEntry("Sync")); } @@ -127,7 +127,7 @@ DiffDialog::~DiffDialog() { saveDialogSize(partConfig, "DiffDialog"); - KConfigGroupSaver cs(&partConfig, "DiffDialog"); + TDEConfigGroupSaver cs(&partConfig, "DiffDialog"); partConfig.writeEntry("Sync", syncbox->isChecked()); } @@ -230,7 +230,7 @@ bool DiffDialog::parseCvsDiff(CvsService_stub* service, const TQString& fileName i18n("Working dir:") : i18n("Revision ")+revB+":" ); - KConfigGroupSaver cs(&partConfig, "General"); + TDEConfigGroupSaver cs(&partConfig, "General"); // Ok, this is a hack: When the user wants an external diff // front end, it is executed from here. Of course, in that |