diff options
author | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kate/app/kateconfigdialog.cpp | |
parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kate/app/kateconfigdialog.cpp')
-rw-r--r-- | kate/app/kateconfigdialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp index 1433d95be..afa77b6a5 100644 --- a/kate/app/kateconfigdialog.cpp +++ b/kate/app/kateconfigdialog.cpp @@ -68,7 +68,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) parent, "configdialog" ) { - KConfig *config = KateApp::self()->config(); + TDEConfig *config = KateApp::self()->config(); KWin::setIcons( winId(), KateApp::self()->icon(), KateApp::self()->miniIcon() ); @@ -372,7 +372,7 @@ void KateConfigDialog::slotOk() void KateConfigDialog::slotApply() { - KConfig *config = KateApp::self()->config(); + TDEConfig *config = KateApp::self()->config(); // if data changed apply the kate app stuff if( dataChanged ) |