diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /klipper/configdialog.cpp | |
parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'klipper/configdialog.cpp')
-rw-r--r-- | klipper/configdialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp index d48f45b9c..2fcc23352 100644 --- a/klipper/configdialog.cpp +++ b/klipper/configdialog.cpp @@ -35,7 +35,7 @@ #include "configdialog.h" -ConfigDialog::ConfigDialog( const ActionList *list, KGlobalAccel *accel, +ConfigDialog::ConfigDialog( const ActionList *list, TDEGlobalAccel *accel, bool isApplet ) : KDialogBase( Tabbed, i18n("Configure"), Ok | Cancel | Help, |