diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:10:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:10:32 -0600 |
| commit | 3fe437def8063926892bddf2dcc733861308836d (patch) | |
| tree | 021d66ad023a32bc8ea0074a1ab3d01316aff8b0 /karbon | |
| parent | 5b8ab149469c8e186ee8b05d90c0103ae722dd85 (diff) | |
| download | koffice-3fe437def8063926892bddf2dcc733861308836d.tar.gz koffice-3fe437def8063926892bddf2dcc733861308836d.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'karbon')
| -rw-r--r-- | karbon/dialogs/vconfiguredlg.h | 8 | ||||
| -rw-r--r-- | karbon/karbon_part.cc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/karbon/dialogs/vconfiguredlg.h b/karbon/dialogs/vconfiguredlg.h index 80c2114b..8203c3f8 100644 --- a/karbon/dialogs/vconfiguredlg.h +++ b/karbon/dialogs/vconfiguredlg.h @@ -24,7 +24,7 @@ #include <kdialogbase.h> class KarbonView; -class KConfig; +class TDEConfig; class KIntNumInput; class KColorButton; class KoUnitDoubleSpinBox; @@ -47,7 +47,7 @@ public slots: private: KarbonView* m_view; - KConfig* m_config; + TDEConfig* m_config; KIntNumInput* m_recentFiles; int m_oldRecentFiles; @@ -81,7 +81,7 @@ public slots: private: KarbonView* m_view; - KConfig* m_config; + TDEConfig* m_config; KIntNumInput* m_undoRedo; int m_oldUndoRedo; @@ -105,7 +105,7 @@ public slots: private: KarbonView* m_view; - KConfig* m_config; + TDEConfig* m_config; KIntNumInput* m_autoSave; int m_oldAutoSave; diff --git a/karbon/karbon_part.cc b/karbon/karbon_part.cc index c4dc2041..53cb44de 100644 --- a/karbon/karbon_part.cc +++ b/karbon/karbon_part.cc @@ -617,7 +617,7 @@ KarbonPart::setUndoRedoLimit( int undos ) void KarbonPart::initConfig() { - KConfig* config = KarbonPart::instance()->config(); + TDEConfig* config = KarbonPart::instance()->config(); if( config->hasGroup( "Interface" ) ) { |