diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
| commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
| tree | 7b7a01768b3781763186c825af21bb14717d2c32 /tdeui/kedittoolbar.h | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/kedittoolbar.h')
| -rw-r--r-- | tdeui/kedittoolbar.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tdeui/kedittoolbar.h b/tdeui/kedittoolbar.h index 60a15d5de..cc1a0069a 100644 --- a/tdeui/kedittoolbar.h +++ b/tdeui/kedittoolbar.h @@ -23,7 +23,7 @@ #include <kxmlguiclient.h> #include <kdialogbase.h> -class KProcess; +class TDEProcess; class KActionCollection; class TQComboBox; class TQToolButton; @@ -66,7 +66,7 @@ namespace * \code * void MyClass::slotConfigureToolbars() * { - * saveMainWindowSettings( KGlobal::config(), "MainWindow" ); + * saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); * KEditToolbar dlg(actionCollection()); * connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); * dlg.exec(); @@ -76,7 +76,7 @@ namespace * { * ...if you use any action list, use plugActionList on each here... * createGUI(); - * applyMainWindowSettings( KGlobal::config(), "MainWindow" ); + * applyMainWindowSettings( TDEGlobal::config(), "MainWindow" ); * } * \endcode * @@ -91,7 +91,7 @@ namespace * An example would be: * * \code - * saveMainWindowSettings( KGlobal::config(), "MainWindow" ); + * saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); * KEditToolbar dlg(factory()); * connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); * dlg.exec(); @@ -100,7 +100,7 @@ namespace * { * ...if you use any action list, use plugActionList on each here... * // Do NOT call createGUI()! - * applyMainWindowSettings( KGlobal::config(), "MainWindow" ); + * applyMainWindowSettings( TDEGlobal::config(), "MainWindow" ); * } * \endcode * @@ -406,7 +406,7 @@ protected slots: void slotChangeIcon(); private slots: - void slotProcessExited( KProcess* ); + void slotProcessExited( TDEProcess* ); protected: // KDE4: make private void setupLayout(); |