diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:14:36 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:14:36 -0600 |
commit | 7716a5e605907a009e19f429cec4e6b5f346bd71 (patch) | |
tree | 16cf4a5d7a24db774f988022d514adefc75015c0 /umbrello/umbrello/dialogs | |
parent | 0117fbed932653a04aeef16b2ed7edee858959ac (diff) | |
download | tdesdk-7716a5e605907a009e19f429cec4e6b5f346bd71.tar.gz tdesdk-7716a5e605907a009e19f429cec4e6b5f346bd71.zip |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'umbrello/umbrello/dialogs')
-rw-r--r-- | umbrello/umbrello/dialogs/activitydialog.cpp | 2 | ||||
-rw-r--r-- | umbrello/umbrello/dialogs/activitydialog.h | 2 | ||||
-rw-r--r-- | umbrello/umbrello/dialogs/assocpropdlg.cpp | 2 | ||||
-rw-r--r-- | umbrello/umbrello/dialogs/assocpropdlg.h | 2 | ||||
-rw-r--r-- | umbrello/umbrello/dialogs/classpropdlg.cpp | 2 | ||||
-rw-r--r-- | umbrello/umbrello/dialogs/classpropdlg.h | 2 | ||||
-rw-r--r-- | umbrello/umbrello/dialogs/codevieweroptionsbase.ui | 4 | ||||
-rw-r--r-- | umbrello/umbrello/dialogs/settingsdlg.cpp | 2 | ||||
-rw-r--r-- | umbrello/umbrello/dialogs/settingsdlg.h | 2 | ||||
-rw-r--r-- | umbrello/umbrello/dialogs/statedialog.cpp | 2 | ||||
-rw-r--r-- | umbrello/umbrello/dialogs/statedialog.h | 4 | ||||
-rw-r--r-- | umbrello/umbrello/dialogs/umlviewdialog.cpp | 2 | ||||
-rw-r--r-- | umbrello/umbrello/dialogs/umlviewdialog.h | 4 |
13 files changed, 16 insertions, 16 deletions
diff --git a/umbrello/umbrello/dialogs/activitydialog.cpp b/umbrello/umbrello/dialogs/activitydialog.cpp index ed7f779e..c128e027 100644 --- a/umbrello/umbrello/dialogs/activitydialog.cpp +++ b/umbrello/umbrello/dialogs/activitydialog.cpp @@ -106,7 +106,7 @@ void ActivityDialog::setupGeneralPage() { void ActivityDialog::setupFontPage() { TQVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts") ); - m_pChooser = new KFontChooser( (TQWidget*)page, "font", false, TQStringList(), false); + m_pChooser = new TDEFontChooser( (TQWidget*)page, "font", false, TQStringList(), false); m_pChooser -> setFont( m_pActivityWidget -> getFont() ); } diff --git a/umbrello/umbrello/dialogs/activitydialog.h b/umbrello/umbrello/dialogs/activitydialog.h index 99af61e0..27b49b40 100644 --- a/umbrello/umbrello/dialogs/activitydialog.h +++ b/umbrello/umbrello/dialogs/activitydialog.h @@ -102,7 +102,7 @@ protected: /** * Font chooser widget for font page. */ - KFontChooser * m_pChooser; + TDEFontChooser * m_pChooser; /** * Color page diff --git a/umbrello/umbrello/dialogs/assocpropdlg.cpp b/umbrello/umbrello/dialogs/assocpropdlg.cpp index 1d5b9c77..331e3e45 100644 --- a/umbrello/umbrello/dialogs/assocpropdlg.cpp +++ b/umbrello/umbrello/dialogs/assocpropdlg.cpp @@ -107,7 +107,7 @@ void AssocPropDlg::setupFontPage() return; TQVBox *page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts")); - m_pChooser = new KFontChooser( (TQWidget*)page, "font", false, TQStringList(), false); + m_pChooser = new TDEFontChooser( (TQWidget*)page, "font", false, TQStringList(), false); m_pChooser->setFont( m_pAssoc->getFont()); m_pChooser->setSampleText(i18n("Association font")); } diff --git a/umbrello/umbrello/dialogs/assocpropdlg.h b/umbrello/umbrello/dialogs/assocpropdlg.h index 1970e59b..7f20c427 100644 --- a/umbrello/umbrello/dialogs/assocpropdlg.h +++ b/umbrello/umbrello/dialogs/assocpropdlg.h @@ -62,7 +62,7 @@ protected slots: private: AssocGenPage *m_pGenPage; AssocRolePage *m_pRolePage; - KFontChooser * m_pChooser; + TDEFontChooser * m_pChooser; AssociationWidget *m_pAssoc; UMLDoc *m_pDoc; // is this needed?? diff --git a/umbrello/umbrello/dialogs/classpropdlg.cpp b/umbrello/umbrello/dialogs/classpropdlg.cpp index 169de20e..ccd09bba 100644 --- a/umbrello/umbrello/dialogs/classpropdlg.cpp +++ b/umbrello/umbrello/dialogs/classpropdlg.cpp @@ -241,7 +241,7 @@ void ClassPropDlg::setupFontPage() { if( !m_pWidget ) return; TQVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts") ); - m_pChooser = new KFontChooser( (TQWidget*)page, "font", false, TQStringList(), false); + m_pChooser = new TDEFontChooser( (TQWidget*)page, "font", false, TQStringList(), false); m_pChooser -> setFont( m_pWidget -> getFont() ); } diff --git a/umbrello/umbrello/dialogs/classpropdlg.h b/umbrello/umbrello/dialogs/classpropdlg.h index e8bcb2c6..d11e0d25 100644 --- a/umbrello/umbrello/dialogs/classpropdlg.h +++ b/umbrello/umbrello/dialogs/classpropdlg.h @@ -104,7 +104,7 @@ protected: */ void setupFontPage(); private: - KFontChooser * m_pChooser; + TDEFontChooser * m_pChooser; ClassGenPage * m_pGenPage; ClassifierListPage* m_pAttPage; ClassifierListPage* m_pOpsPage; diff --git a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui index 346dc44d..4de2f313 100644 --- a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui +++ b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KFontChooser" row="0" column="0"> + <widget class="TDEFontChooser" row="0" column="0"> <property name="name"> <cstring>fontChooser</cstring> </property> @@ -341,7 +341,7 @@ </widget> <customwidgets> <customwidget> - <class>KFontChooser</class> + <class>TDEFontChooser</class> <header location="global">kfontdialog.h</header> <sizehint> <width>-1</width> diff --git a/umbrello/umbrello/dialogs/settingsdlg.cpp b/umbrello/umbrello/dialogs/settingsdlg.cpp index 145b0519..234f67bc 100644 --- a/umbrello/umbrello/dialogs/settingsdlg.cpp +++ b/umbrello/umbrello/dialogs/settingsdlg.cpp @@ -304,7 +304,7 @@ void SettingsDlg::setupCodeViewerPage(Settings::CodeViewerState options) { void SettingsDlg::setupFontPage() { TQVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts") ); - m_FontWidgets.chooser = new KFontChooser( page, "font", false, TQStringList(), false); + m_FontWidgets.chooser = new TDEFontChooser( page, "font", false, TQStringList(), false); m_FontWidgets.chooser->setFont( m_pOptionState->uiState.font ); } diff --git a/umbrello/umbrello/dialogs/settingsdlg.h b/umbrello/umbrello/dialogs/settingsdlg.h index 78f8b064..98fb4549 100644 --- a/umbrello/umbrello/dialogs/settingsdlg.h +++ b/umbrello/umbrello/dialogs/settingsdlg.h @@ -142,7 +142,7 @@ private: ;//end struct ClassWidgets struct FontWidgets { - KFontChooser * chooser; + TDEFontChooser * chooser; }; //private methods diff --git a/umbrello/umbrello/dialogs/statedialog.cpp b/umbrello/umbrello/dialogs/statedialog.cpp index 564146ec..e49d1633 100644 --- a/umbrello/umbrello/dialogs/statedialog.cpp +++ b/umbrello/umbrello/dialogs/statedialog.cpp @@ -122,7 +122,7 @@ void StateDialog::setupFontPage() { if ( !m_pStateWidget ) return; TQVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts") ); - m_pChooser = new KFontChooser( (TQWidget*)page, "font", false, TQStringList(), false); + m_pChooser = new TDEFontChooser( (TQWidget*)page, "font", false, TQStringList(), false); m_pChooser -> setFont( m_pStateWidget -> getFont() ); } diff --git a/umbrello/umbrello/dialogs/statedialog.h b/umbrello/umbrello/dialogs/statedialog.h index 873ad067..86f4eb62 100644 --- a/umbrello/umbrello/dialogs/statedialog.h +++ b/umbrello/umbrello/dialogs/statedialog.h @@ -26,7 +26,7 @@ class TQLabel; class TQLineEdit; class TQMultiLineEdit; class TQGroupBox; -class KFontChooser; +class TDEFontChooser; /** * Displays the properties for a @ref StateWidget @@ -107,7 +107,7 @@ protected: /** * Font chooser widget for font page. */ - KFontChooser * m_pChooser; + TDEFontChooser * m_pChooser; /** * Color page diff --git a/umbrello/umbrello/dialogs/umlviewdialog.cpp b/umbrello/umbrello/dialogs/umlviewdialog.cpp index 33a6a21f..804100c4 100644 --- a/umbrello/umbrello/dialogs/umlviewdialog.cpp +++ b/umbrello/umbrello/dialogs/umlviewdialog.cpp @@ -105,7 +105,7 @@ void UMLViewDialog::setupColorPage() { void UMLViewDialog::setupFontPage() { TQVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts") ); - m_pChooser = new KFontChooser( (TQWidget*)page, "font", false, TQStringList(), false); + m_pChooser = new TDEFontChooser( (TQWidget*)page, "font", false, TQStringList(), false); m_pChooser -> setFont( m_pView -> getOptionState().uiState.font ); } diff --git a/umbrello/umbrello/dialogs/umlviewdialog.h b/umbrello/umbrello/dialogs/umlviewdialog.h index 8effb99c..5d466d50 100644 --- a/umbrello/umbrello/dialogs/umlviewdialog.h +++ b/umbrello/umbrello/dialogs/umlviewdialog.h @@ -31,7 +31,7 @@ class TQLineEdit; class TQGroupBox; class TQTextEdit; class TQSpinBox; -class KFontChooser; +class TDEFontChooser; class DiagramPropertiesPage; @@ -99,7 +99,7 @@ protected: Settings::OptionState m_options; - KFontChooser * m_pChooser; + TDEFontChooser * m_pChooser; DiagramPropertiesPage *m_diagramProperties; ClassOptionsPage * m_pOptionsPage; UMLWidgetColorPage * m_pColorPage; |