diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:48:31 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:48:31 -0600 |
commit | c48e769eb275917717e2b55eb869f7e559293ac8 (patch) | |
tree | 8f650b907e21c918b826f854dbe1c8174cc2c0c6 /kdict/actions.cpp | |
parent | 8011d84f483f3628f3f04ea5cb2c1c3c86b2dba7 (diff) | |
download | tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.tar.gz tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kdict/actions.cpp')
-rw-r--r-- | kdict/actions.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kdict/actions.cpp b/kdict/actions.cpp index 1c9c757c..5acf3c3c 100644 --- a/kdict/actions.cpp +++ b/kdict/actions.cpp @@ -26,7 +26,7 @@ DictComboAction::DictComboAction( const TQString &text, TQObject *parent, const char *name, bool editable, bool autoSized ) - : KAction( text, 0, parent, name ), m_editable(editable), m_autoSized(autoSized), m_compMode(KGlobalSettings::completionMode()) + : KAction( text, 0, parent, name ), m_editable(editable), m_autoSized(autoSized), m_compMode(TDEGlobalSettings::completionMode()) { } @@ -160,7 +160,7 @@ void DictComboAction::setList(TQStringList items) } -KGlobalSettings::Completion DictComboAction::completionMode() +TDEGlobalSettings::Completion DictComboAction::completionMode() { if (m_combo) return m_combo->completionMode(); @@ -169,7 +169,7 @@ KGlobalSettings::Completion DictComboAction::completionMode() } -void DictComboAction::setCompletionMode(KGlobalSettings::Completion mode) +void DictComboAction::setCompletionMode(TDEGlobalSettings::Completion mode) { if (m_combo) m_combo->setCompletionMode(mode); |