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.h | |
| 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.h')
| -rw-r--r-- | klipper/configdialog.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/klipper/configdialog.h b/klipper/configdialog.h index 514f40bc7..7db964b4c 100644 --- a/klipper/configdialog.h +++ b/klipper/configdialog.h @@ -35,7 +35,7 @@ #include "urlgrabber.h" -class KGlobalAccel; +class TDEGlobalAccel; class KKeyChooser; class KListView; class TQPushButton; @@ -137,7 +137,7 @@ class ConfigDialog : public KDialogBase Q_OBJECT public: - ConfigDialog( const ActionList *list, KGlobalAccel *accel, bool isApplet ); + ConfigDialog( const ActionList *list, TDEGlobalAccel *accel, bool isApplet ); ~ConfigDialog(); ActionList * actionList() const { return actionWidget->actionList(); } |