diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:22:57 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:22:57 -0600 |
| commit | 5be945600e2d7776e74663f56c2a25a8f57d7891 (patch) | |
| tree | 9be5ab8203c0769df4dc0f314c45e52fa5ecfd8c /kdevdesigner | |
| parent | e36b30d13d1f89100fae656adfde2b52234d12b6 (diff) | |
| download | tdevelop-5be945600e2d7776e74663f56c2a25a8f57d7891.tar.gz tdevelop-5be945600e2d7776e74663f56c2a25a8f57d7891.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kdevdesigner')
| -rw-r--r-- | kdevdesigner/designer/kdevdesigner_part.cpp | 22 | ||||
| -rw-r--r-- | kdevdesigner/designer/kdevdesigner_part.h | 2 | ||||
| -rw-r--r-- | kdevdesigner/src/kdevdesigner.cpp | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp index 8e639dc8..f5c44a07 100644 --- a/kdevdesigner/designer/kdevdesigner_part.cpp +++ b/kdevdesigner/designer/kdevdesigner_part.cpp @@ -21,8 +21,8 @@ #include "kdevdesigner_part.h" #include <kinstance.h> -#include <kaction.h> -#include <kactionclasses.h> +#include <tdeaction.h> +#include <tdeactionclasses.h> #include <kstdaction.h> #include <tdefiledialog.h> #include <kdebug.h> @@ -209,15 +209,15 @@ bool KDevDesignerPart::saveFile() return true; } -void KDevDesignerPart::stateSync( TDEAction * kaction, TQAction * qaction ) +void KDevDesignerPart::stateSync( TDEAction * tdeaction, TQAction * qaction ) { if (!qaction) return; - kaction->setEnabled(qaction->isEnabled()); + tdeaction->setEnabled(qaction->isEnabled()); DesignerAction *ac = dynamic_cast<DesignerAction*>(qaction); if (!ac) return; - connect(ac, TQT_SIGNAL(actionEnabled(bool )), kaction, TQT_SLOT(setEnabled(bool ))); + connect(ac, TQT_SIGNAL(actionEnabled(bool )), tdeaction, TQT_SLOT(setEnabled(bool ))); } void KDevDesignerPart::setupToolsAction( TDERadioAction * toggle, TQAction * action ) @@ -475,13 +475,13 @@ void KDevDesignerPart::setToggleActionChecked( bool b) pointerAction->setChecked(true); return; } - TDERadioAction *kaction = m_actionMap[action]; - if (!kaction) + TDERadioAction *tdeaction = m_actionMap[action]; + if (!tdeaction) return; -// kdDebug() << "untoggle action: " << kaction->text() << endl; - kaction->blockSignals(true); - kaction->setChecked(b); - kaction->blockSignals(false); +// kdDebug() << "untoggle action: " << tdeaction->text() << endl; + tdeaction->blockSignals(true); + tdeaction->setChecked(b); + tdeaction->blockSignals(false); } void KDevDesignerPart::setToggleActionOn( bool b ) diff --git a/kdevdesigner/designer/kdevdesigner_part.h b/kdevdesigner/designer/kdevdesigner_part.h index d7c9bf3c..3006c600 100644 --- a/kdevdesigner/designer/kdevdesigner_part.h +++ b/kdevdesigner/designer/kdevdesigner_part.h @@ -70,7 +70,7 @@ protected: void setupDesignerWindow(); void setupActions(); - void stateSync(TDEAction *kaction, TQAction *qaction); + void stateSync(TDEAction *tdeaction, TQAction *qaction); void setupToolsAction(TDERadioAction *toggle, TQAction *action); protected slots: diff --git a/kdevdesigner/src/kdevdesigner.cpp b/kdevdesigner/src/kdevdesigner.cpp index e184fe01..fb90e0e0 100644 --- a/kdevdesigner/src/kdevdesigner.cpp +++ b/kdevdesigner/src/kdevdesigner.cpp @@ -29,7 +29,7 @@ #include <kedittoolbar.h> -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <klibloader.h> |