From f8069e2ea048f2657cc417d83820576ec55c181b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:37:49 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kompare/libdialogpages/diffsettings.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kompare/libdialogpages/diffsettings.cpp') 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( 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 ); -- cgit v1.2.1