diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:56 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:56 -0600 |
| commit | e6aaa3624cc6179b82a9bfff1760e742a669064c (patch) | |
| tree | 3fed4deb0540d34f85dfb53b02bea7519e66cc6f /umbrello/umbrello/dialogs/settingsdlg.cpp | |
| parent | 4071ae43ea213cd0f7d5c344c939ebd97d097051 (diff) | |
| download | tdesdk-e6aaa3624cc6179b82a9bfff1760e742a669064c.tar.gz tdesdk-e6aaa3624cc6179b82a9bfff1760e742a669064c.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'umbrello/umbrello/dialogs/settingsdlg.cpp')
| -rw-r--r-- | umbrello/umbrello/dialogs/settingsdlg.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/umbrello/umbrello/dialogs/settingsdlg.cpp b/umbrello/umbrello/dialogs/settingsdlg.cpp index b5cddff5..172c695f 100644 --- a/umbrello/umbrello/dialogs/settingsdlg.cpp +++ b/umbrello/umbrello/dialogs/settingsdlg.cpp @@ -177,7 +177,7 @@ void SettingsDlg::setupGeneralPage() { startupLayout -> addWidget( m_GeneralWidgets.startL, 2, 0 ); m_GeneralWidgets.diagramKB = new KComboBox( m_GeneralWidgets.startupGB ); - m_GeneralWidgets.diagramKB->setCompletionMode( KGlobalSettings::CompletionPopup ); + m_GeneralWidgets.diagramKB->setCompletionMode( TDEGlobalSettings::CompletionPopup ); startupLayout -> addWidget( m_GeneralWidgets.diagramKB, 2, 1 ); TQString diagrams [] = { i18n("No Diagram"), i18n("Class Diagram"), @@ -260,7 +260,7 @@ void SettingsDlg::setupClassPage() { insertAttribScope( tr2i18n( "Private" ) ); insertAttribScope( tr2i18n( "Protected" ) ); m_ClassWidgets.m_pAttribScopeCB->setCurrentItem((m_pOptionState->classState.defaultAttributeScope - 200)); - m_ClassWidgets.m_pAttribScopeCB->setCompletionMode( KGlobalSettings::CompletionPopup ); + m_ClassWidgets.m_pAttribScopeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup ); scopeLayout -> addWidget( m_ClassWidgets.m_pAttribScopeCB, 0, 1 ); m_ClassWidgets.m_pOperationScopeCB = new KComboBox(m_ClassWidgets.scopeGB); @@ -268,7 +268,7 @@ void SettingsDlg::setupClassPage() { insertOperationScope( tr2i18n( "Private" ) ); insertOperationScope( tr2i18n( "Protected" ) ); m_ClassWidgets.m_pOperationScopeCB->setCurrentItem((m_pOptionState->classState.defaultOperationScope - 200)); - m_ClassWidgets.m_pOperationScopeCB->setCompletionMode( KGlobalSettings::CompletionPopup ); + m_ClassWidgets.m_pOperationScopeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup ); scopeLayout -> addWidget( m_ClassWidgets.m_pOperationScopeCB, 1, 1 ); } |