summaryrefslogtreecommitdiffstats
path: root/kompare/libdialogpages/diffsettings.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:49 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:37:49 -0600
commitf8069e2ea048f2657cc417d83820576ec55c181b (patch)
treecbc5bf540866934a91e0f33b260fc7a25e191fad /kompare/libdialogpages/diffsettings.cpp
parente6aaa3624cc6179b82a9bfff1760e742a669064c (diff)
downloadtdesdk-f8069e2ea048f2657cc417d83820576ec55c181b.tar.gz
tdesdk-f8069e2ea048f2657cc417d83820576ec55c181b.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kompare/libdialogpages/diffsettings.cpp')
-rw-r--r--kompare/libdialogpages/diffsettings.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/kompare/libdialogpages/diffsettings.cpp b/kompare/libdialogpages/diffsettings.cpp
index 6c2186f5..26239d78 100644
--- a/kompare/libdialogpages/diffsettings.cpp
+++ b/kompare/libdialogpages/diffsettings.cpp
@@ -44,9 +44,9 @@ DiffSettings::~DiffSettings()
{
}
-void DiffSettings::loadSettings( KConfig* config )
+void DiffSettings::loadSettings( TDEConfig* config )
{
- KConfigGroup group( config, "Diff Options" );
+ TDEConfigGroup group( config, "Diff Options" );
m_diffProgram = group.readEntry ( "DiffProgram", "" );
m_linesOfContext = group.readNumEntry ( "LinesOfContext", 3 );
m_largeFiles = group.readBoolEntry( "LargeFiles", true );
@@ -66,7 +66,7 @@ void DiffSettings::loadSettings( KConfig* config )
m_format = static_cast<Kompare::Format>( group.readNumEntry( "Format", Kompare::Unified ) );
- KConfigGroup group2 ( config, "Exclude File Options" );
+ TDEConfigGroup group2 ( config, "Exclude File Options" );
m_excludeFilePattern = group2.readBoolEntry( "Pattern", false );
m_excludeFilePatternList = group2.readListEntry( "PatternList" );
m_excludeFilesFile = group2.readBoolEntry( "File", false );
@@ -74,9 +74,9 @@ void DiffSettings::loadSettings( KConfig* config )
m_excludeFilesFileHistoryList = group2.readListEntry( "FileHistoryList" );
}
-void DiffSettings::saveSettings( KConfig* config )
+void DiffSettings::saveSettings( TDEConfig* config )
{
- KConfigGroup group( config, "Diff Options" );
+ TDEConfigGroup group( config, "Diff Options" );
group.writeEntry( "DiffProgram", m_diffProgram );
group.writeEntry( "LinesOfContext", m_linesOfContext );
group.writeEntry( "Format", m_format );
@@ -96,7 +96,7 @@ void DiffSettings::saveSettings( KConfig* config )
group.writeEntry( "NewFiles", m_newFiles );
group.setDirty( true );
- KConfigGroup group2( config, "Exclude File Options" );
+ TDEConfigGroup group2( config, "Exclude File Options" );
group2.writeEntry( "Pattern", m_excludeFilePattern );
group2.writeEntry( "PatternList", m_excludeFilePatternList );
group2.writeEntry( "File", m_excludeFilesFile );