diff options
Diffstat (limited to 'umbrello/umbrello/dialogs')
70 files changed, 1226 insertions, 1226 deletions
diff --git a/umbrello/umbrello/dialogs/activitydialog.cpp b/umbrello/umbrello/dialogs/activitydialog.cpp index d34782a5..ed7f779e 100644 --- a/umbrello/umbrello/dialogs/activitydialog.cpp +++ b/umbrello/umbrello/dialogs/activitydialog.cpp @@ -13,7 +13,7 @@ #include "activitydialog.h" //qt includes -#include <qlayout.h> +#include <tqlayout.h> //kde includes #include <kiconloader.h> @@ -67,17 +67,17 @@ void ActivityDialog::applyPage( Page page ) { } void ActivityDialog::setupGeneralPage() { - QString types[ ] = { i18n("Initial activity"), i18n("Activity"), i18n("End activity"), i18n( "Branch/Merge"), i18n( "Fork/Join" ) }; + TQString types[ ] = { i18n("Initial activity"), i18n("Activity"), i18n("End activity"), i18n( "Branch/Merge"), i18n( "Fork/Join" ) }; ActivityWidget::ActivityType type = m_pActivityWidget -> getActivityType(); - QVBox * page = addVBoxPage( i18n("General"), i18n("General Properties"), DesktopIcon( "misc") ); - m_GenPageWidgets.generalGB = new QGroupBox( i18n( "Properties"), (QWidget *)page ); + TQVBox * page = addVBoxPage( i18n("General"), i18n("General Properties"), DesktopIcon( "misc") ); + m_GenPageWidgets.generalGB = new TQGroupBox( i18n( "Properties"), (TQWidget *)page ); - QGridLayout * generalLayout = new QGridLayout( m_GenPageWidgets.generalGB, 2, 2 ); + TQGridLayout * generalLayout = new TQGridLayout( m_GenPageWidgets.generalGB, 2, 2 ); generalLayout -> setSpacing( spacingHint() ); generalLayout -> setMargin( fontMetrics().height() ); - QString actType ( types[ (int)type ] ); + TQString actType ( types[ (int)type ] ); Dialog_Utils::makeLabeledEditField( m_GenPageWidgets.generalGB, generalLayout, 0, m_GenPageWidgets.typeL, i18n("Activity type:"), m_GenPageWidgets.typeLE, actType ); @@ -87,13 +87,13 @@ void ActivityDialog::setupGeneralPage() { m_GenPageWidgets.nameL, i18n("Activity name:"), m_GenPageWidgets.nameLE ); - m_GenPageWidgets.docGB = new QGroupBox( i18n( "Documentation"), (QWidget *)page ); + m_GenPageWidgets.docGB = new TQGroupBox( i18n( "Documentation"), (TQWidget *)page ); - QHBoxLayout * docLayout = new QHBoxLayout( m_GenPageWidgets.docGB ); + TQHBoxLayout * docLayout = new TQHBoxLayout( m_GenPageWidgets.docGB ); docLayout -> setSpacing( spacingHint() ); docLayout -> setMargin( fontMetrics().height() ); - m_GenPageWidgets.docMLE = new QMultiLineEdit( m_GenPageWidgets.docGB ); + m_GenPageWidgets.docMLE = new TQMultiLineEdit( m_GenPageWidgets.docGB ); m_GenPageWidgets.docMLE -> setText( m_pActivityWidget -> getDoc() ); docLayout -> addWidget( m_GenPageWidgets.docMLE ); @@ -105,14 +105,14 @@ void ActivityDialog::setupGeneralPage() { } void ActivityDialog::setupFontPage() { - QVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts") ); - m_pChooser = new KFontChooser( (QWidget*)page, "font", false, QStringList(), false); + TQVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts") ); + m_pChooser = new KFontChooser( (TQWidget*)page, "font", false, TQStringList(), false); m_pChooser -> setFont( m_pActivityWidget -> getFont() ); } void ActivityDialog::setupColorPage() { - QFrame * colorPage = addPage( i18n("Color"), i18n("Widget Colors"), DesktopIcon( "colors") ); - QHBoxLayout * m_pColorLayout = new QHBoxLayout(colorPage); + TQFrame * colorPage = addPage( i18n("Color"), i18n("Widget Colors"), DesktopIcon( "colors") ); + TQHBoxLayout * m_pColorLayout = new TQHBoxLayout(colorPage); m_pColorPage = new UMLWidgetColorPage( colorPage, m_pActivityWidget ); m_pColorLayout -> addWidget(m_pColorPage); } diff --git a/umbrello/umbrello/dialogs/activitydialog.h b/umbrello/umbrello/dialogs/activitydialog.h index 4dc5980b..ccc746c3 100644 --- a/umbrello/umbrello/dialogs/activitydialog.h +++ b/umbrello/umbrello/dialogs/activitydialog.h @@ -13,10 +13,10 @@ #define ACTIVITYDIALOG_H //qt class includes -#include <qlabel.h> -#include <qlineedit.h> -#include <qmultilineedit.h> -#include <qgroupbox.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqmultilineedit.h> +#include <tqgroupbox.h> //kde class includes #include <kdialogbase.h> @@ -124,11 +124,11 @@ protected: bool m_bChangesMade; struct GeneralPageWidgets { - QLabel * nameL, * typeL; - QLineEdit * nameLE, * typeLE; - QMultiLineEdit * docMLE; + TQLabel * nameL, * typeL; + TQLineEdit * nameLE, * typeLE; + TQMultiLineEdit * docMLE; - QGroupBox * docGB, * generalGB; + TQGroupBox * docGB, * generalGB; } m_GenPageWidgets; }; diff --git a/umbrello/umbrello/dialogs/activitypage.cpp b/umbrello/umbrello/dialogs/activitypage.cpp index 8d3f5931..5a728576 100644 --- a/umbrello/umbrello/dialogs/activitypage.cpp +++ b/umbrello/umbrello/dialogs/activitypage.cpp @@ -18,10 +18,10 @@ #include <klocale.h> #include <kbuttonbox.h> #include <kdebug.h> -#include <qlayout.h> -#include <qstringlist.h> +#include <tqlayout.h> +#include <tqstringlist.h> -ActivityPage::ActivityPage( QWidget * pParent, StateWidget * pWidget ) : QWidget( pParent ) { +ActivityPage::ActivityPage( TQWidget * pParent, StateWidget * pWidget ) : TQWidget( pParent ) { m_pStateWidget = pWidget; m_pMenu = 0; setupPage(); @@ -32,24 +32,24 @@ ActivityPage::~ActivityPage() {} void ActivityPage::setupPage() { int margin = fontMetrics().height(); - QVBoxLayout * mainLayout = new QVBoxLayout( this ); + TQVBoxLayout * mainLayout = new TQVBoxLayout( this ); mainLayout -> setSpacing(10); - m_pActivityGB = new QGroupBox(i18n("Activities"), this ); + m_pActivityGB = new TQGroupBox(i18n("Activities"), this ); // vertical box layout for the activity lists, arrow buttons and the button box - QVBoxLayout* listVBoxLayout = new QVBoxLayout( m_pActivityGB ); + TQVBoxLayout* listVBoxLayout = new TQVBoxLayout( m_pActivityGB ); listVBoxLayout -> setMargin(margin); listVBoxLayout -> setSpacing ( 10 ); //horizontal box contains the list box and the move up/down buttons - QHBoxLayout* listHBoxLayout = new QHBoxLayout( listVBoxLayout ); + TQHBoxLayout* listHBoxLayout = new TQHBoxLayout( listVBoxLayout ); - m_pActivityLB = new QListBox(m_pActivityGB ); + m_pActivityLB = new TQListBox(m_pActivityGB ); listHBoxLayout -> addWidget(m_pActivityLB); - QVBoxLayout * buttonLayout = new QVBoxLayout( listHBoxLayout ); + TQVBoxLayout * buttonLayout = new TQVBoxLayout( listHBoxLayout ); m_pTopArrowB = new KArrowButton( m_pActivityGB ); m_pTopArrowB -> setEnabled( false ); @@ -69,42 +69,42 @@ void ActivityPage::setupPage() { KButtonBox* buttonBox = new KButtonBox(m_pActivityGB); - buttonBox->addButton( i18n("New Activity..."), this, SLOT(slotNewActivity()) ); + buttonBox->addButton( i18n("New Activity..."), this, TQT_SLOT(slotNewActivity()) ); m_pDeleteActivityButton = buttonBox->addButton( i18n("Delete"), - this, SLOT(slotDelete()) ); - m_pRenameButton = buttonBox->addButton( i18n("Rename"), this, SLOT(slotRename()) ); + this, TQT_SLOT(slotDelete()) ); + m_pRenameButton = buttonBox->addButton( i18n("Rename"), this, TQT_SLOT(slotRename()) ); listVBoxLayout->addWidget(buttonBox); mainLayout -> addWidget( m_pActivityGB ); //now fill activity list box - QStringList list = m_pStateWidget -> getActivityList(); - QStringList::Iterator end(list.end()); + TQStringList list = m_pStateWidget -> getActivityList(); + TQStringList::Iterator end(list.end()); - for( QStringList::Iterator it(list.begin()); it != end; ++it ) { + for( TQStringList::Iterator it(list.begin()); it != end; ++it ) { m_pActivityLB -> insertItem( *it ); } //now setup the signals - connect(m_pActivityLB, SIGNAL(clicked(QListBoxItem *)), this, SLOT(slotClicked(QListBoxItem *))); - connect(m_pActivityLB, SIGNAL(rightButtonPressed(QListBoxItem *, const QPoint &)), - this, SLOT(slotRightButtonPressed(QListBoxItem *, const QPoint &))); + connect(m_pActivityLB, TQT_SIGNAL(clicked(TQListBoxItem *)), this, TQT_SLOT(slotClicked(TQListBoxItem *))); + connect(m_pActivityLB, TQT_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), + this, TQT_SLOT(slotRightButtonPressed(TQListBoxItem *, const TQPoint &))); - connect(m_pActivityLB, SIGNAL(rightButtonClicked(QListBoxItem *, const QPoint &)), - this, SLOT(slotRightButtonClicked(QListBoxItem *, const QPoint &))); + connect(m_pActivityLB, TQT_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), + this, TQT_SLOT(slotRightButtonClicked(TQListBoxItem *, const TQPoint &))); - connect( m_pTopArrowB, SIGNAL( clicked() ), this, SLOT( slotTopClicked() ) ); - connect( m_pUpArrowB, SIGNAL( clicked() ), this, SLOT( slotUpClicked() ) ); - connect( m_pDownArrowB, SIGNAL( clicked() ), this, SLOT( slotDownClicked() ) ); - connect( m_pBottomArrowB, SIGNAL( clicked() ), this, SLOT( slotBottomClicked() ) ); + connect( m_pTopArrowB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTopClicked() ) ); + connect( m_pUpArrowB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) ); + connect( m_pDownArrowB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) ); + connect( m_pBottomArrowB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBottomClicked() ) ); - connect( m_pActivityLB, SIGNAL( doubleClicked( QListBoxItem* ) ), this, SLOT( slotDoubleClicked( QListBoxItem* ) ) ); + connect( m_pActivityLB, TQT_SIGNAL( doubleClicked( TQListBoxItem* ) ), this, TQT_SLOT( slotDoubleClicked( TQListBoxItem* ) ) ); enableWidgets(false); } void ActivityPage::updateActivities() { - QStringList list; + TQStringList list; int count = m_pActivityLB -> count(); for( int i = 0; i < count; i++ ) { list.append( m_pActivityLB -> text( i ) ); @@ -130,7 +130,7 @@ void ActivityPage::slotMenuSelection( int sel ) { void ActivityPage::slotNewActivity() { bool ok = false; - QString name = m_pActivityLB->currentText(); + TQString name = m_pActivityLB->currentText(); name = KInputDialog::getText( i18n("New Activity"), i18n("Enter the name of the new activity:"), i18n("new activity"), &ok, UMLApp::app() ); if( ok && name.length() > 0 ) { @@ -140,7 +140,7 @@ void ActivityPage::slotNewActivity() { } void ActivityPage::slotDelete() { - QString name = m_pActivityLB->currentText(); + TQString name = m_pActivityLB->currentText(); m_pStateWidget->removeActivity(name); m_pActivityLB->removeItem( m_pActivityLB->currentItem() ); slotClicked(0); @@ -148,8 +148,8 @@ void ActivityPage::slotDelete() { void ActivityPage::slotRename() { bool ok = false; - QString name = m_pActivityLB -> currentText(); - QString oldName = name; + TQString name = m_pActivityLB -> currentText(); + TQString oldName = name; name = KInputDialog::getText( i18n("Rename Activity"), i18n("Enter the new name of the activity:"), name, &ok, UMLApp::app() ); if( ok && name.length() > 0 ) { m_pActivityLB -> changeItem( name, m_pActivityLB -> currentItem()); @@ -157,16 +157,16 @@ void ActivityPage::slotRename() { } } -void ActivityPage::slotRightButtonClicked(QListBoxItem * /*item*/, const QPoint &/* p*/) { +void ActivityPage::slotRightButtonClicked(TQListBoxItem * /*item*/, const TQPoint &/* p*/) { if(m_pMenu) { m_pMenu->hide(); - disconnect(m_pMenu, SIGNAL(activated(int)), this, SLOT(slotMenuSelection(int))); + disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int))); delete m_pMenu; m_pMenu = 0; } } -void ActivityPage::slotRightButtonPressed(QListBoxItem * item, const QPoint & p) +void ActivityPage::slotRightButtonPressed(TQListBoxItem * item, const TQPoint & p) { ListPopupMenu::Menu_Type type = ListPopupMenu::mt_Undefined; if( item ) { //pressed on an item @@ -177,13 +177,13 @@ void ActivityPage::slotRightButtonPressed(QListBoxItem * item, const QPoint & p) if(m_pMenu) { m_pMenu -> hide(); - disconnect(m_pMenu, SIGNAL(activated(int)), this, SLOT(slotMenuSelection(int))); + disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int))); delete m_pMenu; m_pMenu = 0; } m_pMenu = new ListPopupMenu(this, type); m_pMenu->popup(p); - connect(m_pMenu, SIGNAL(activated(int)), this, SLOT(slotMenuSelection(int))); + connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int))); } @@ -195,11 +195,11 @@ void ActivityPage::slotTopClicked() { return; //swap the text around in the ListBox - QString currentString = m_pActivityLB->text( index ); + TQString currentString = m_pActivityLB->text( index ); m_pActivityLB->removeItem( index ); m_pActivityLB->insertItem( currentString, 0 ); //set the moved item selected - QListBoxItem* item = m_pActivityLB->item( 0 ); + TQListBoxItem* item = m_pActivityLB->item( 0 ); m_pActivityLB->setSelected( item, true ); slotClicked(item); @@ -214,12 +214,12 @@ void ActivityPage::slotUpClicked() { } //swap the text around ( meaning attributes ) - QString aboveString = m_pActivityLB -> text( index - 1 ); - QString currentString = m_pActivityLB -> text( index ); + TQString aboveString = m_pActivityLB -> text( index - 1 ); + TQString currentString = m_pActivityLB -> text( index ); m_pActivityLB -> changeItem( currentString, index -1 ); m_pActivityLB -> changeItem( aboveString, index ); //set the moved atttribute selected - QListBoxItem * item = m_pActivityLB -> item( index - 1 ); + TQListBoxItem * item = m_pActivityLB -> item( index - 1 ); m_pActivityLB -> setSelected( item, true ); slotClicked(item); } @@ -233,12 +233,12 @@ void ActivityPage::slotDownClicked() { } //swap the text around ( meaning attributes ) - QString belowString = m_pActivityLB -> text( index + 1 ); - QString currentString = m_pActivityLB -> text( index ); + TQString belowString = m_pActivityLB -> text( index + 1 ); + TQString currentString = m_pActivityLB -> text( index ); m_pActivityLB -> changeItem( currentString, index + 1 ); m_pActivityLB -> changeItem( belowString, index ); //set the moved atttribute selected - QListBoxItem * item = m_pActivityLB -> item( index + 1 ); + TQListBoxItem * item = m_pActivityLB -> item( index + 1 ); m_pActivityLB -> setSelected( item, true ); slotClicked(item); } @@ -252,18 +252,18 @@ void ActivityPage::slotBottomClicked() { return; //swap the text around in the ListBox - QString currentString = m_pActivityLB->text( index ); + TQString currentString = m_pActivityLB->text( index ); m_pActivityLB->removeItem( index ); m_pActivityLB->insertItem( currentString, m_pActivityLB->count() ); //set the moved item selected - QListBoxItem* item = m_pActivityLB->item( m_pActivityLB->count() - 1 ); + TQListBoxItem* item = m_pActivityLB->item( m_pActivityLB->count() - 1 ); m_pActivityLB->setSelected( item, true ); slotClicked( item ); } -void ActivityPage::slotClicked(QListBoxItem *item) { +void ActivityPage::slotClicked(TQListBoxItem *item) { //make sure clicked on an item if(!item) { enableWidgets(false); @@ -273,7 +273,7 @@ void ActivityPage::slotClicked(QListBoxItem *item) { } } -void ActivityPage::slotDoubleClicked(QListBoxItem* item) { +void ActivityPage::slotDoubleClicked(TQListBoxItem* item) { if (item) { slotRename(); } diff --git a/umbrello/umbrello/dialogs/activitypage.h b/umbrello/umbrello/dialogs/activitypage.h index 7d391b96..57a079e6 100644 --- a/umbrello/umbrello/dialogs/activitypage.h +++ b/umbrello/umbrello/dialogs/activitypage.h @@ -12,9 +12,9 @@ #ifndef ACTIVITYPAGE_H #define ACTIVITYPAGE_H //qt includes -#include <qwidget.h> -#include <qgroupbox.h> -#include <qlistbox.h> +#include <tqwidget.h> +#include <tqgroupbox.h> +#include <tqlistbox.h> //kde includes #include <karrowbutton.h> //app includes @@ -26,13 +26,13 @@ class ListPopupMenu; * @author Paul Hensgen * Bugs and comments to uml-devel@lists.sf.net or http://bugs.kde.org */ -class ActivityPage : public QWidget { +class ActivityPage : public TQWidget { Q_OBJECT public: /** * Constructor */ - ActivityPage( QWidget * pParent, StateWidget * pWidget ); + ActivityPage( TQWidget * pParent, StateWidget * pWidget ); /** * Deconstructor @@ -67,21 +67,21 @@ protected: */ ListPopupMenu * m_pMenu; //GUI widgets - QListBox * m_pActivityLB; - QGroupBox * m_pActivityGB; + TQListBox * m_pActivityLB; + TQGroupBox * m_pActivityGB; KArrowButton * m_pUpArrowB, * m_pDownArrowB, * m_pTopArrowB, *m_pBottomArrowB; - QPushButton* m_pDeleteActivityButton; - QPushButton* m_pRenameButton; + TQPushButton* m_pDeleteActivityButton; + TQPushButton* m_pRenameButton; public slots: /** * Popup menu item selected */ void slotMenuSelection( int sel ); - void slotClicked( QListBoxItem* item ); - void slotDoubleClicked( QListBoxItem* item ); - void slotRightButtonClicked(QListBoxItem* item, const QPoint& p); - void slotRightButtonPressed(QListBoxItem* item, const QPoint& p); + void slotClicked( TQListBoxItem* item ); + void slotDoubleClicked( TQListBoxItem* item ); + void slotRightButtonClicked(TQListBoxItem* item, const TQPoint& p); + void slotRightButtonPressed(TQListBoxItem* item, const TQPoint& p); void slotTopClicked(); void slotUpClicked(); void slotDownClicked(); diff --git a/umbrello/umbrello/dialogs/assocgenpage.cpp b/umbrello/umbrello/dialogs/assocgenpage.cpp index 9be13ee0..b093cae0 100644 --- a/umbrello/umbrello/dialogs/assocgenpage.cpp +++ b/umbrello/umbrello/dialogs/assocgenpage.cpp @@ -13,7 +13,7 @@ #include "assocgenpage.h" // qt includes -#include <qlayout.h> +#include <tqlayout.h> #include <kcombobox.h> // kde includes @@ -25,8 +25,8 @@ #include "../association.h" #include "../dialog_utils.h" -AssocGenPage::AssocGenPage (UMLDoc *d, QWidget *parent, AssociationWidget *assoc) - : QWidget(parent) +AssocGenPage::AssocGenPage (UMLDoc *d, TQWidget *parent, AssociationWidget *assoc) + : TQWidget(parent) { m_pAssociationWidget = assoc; @@ -46,38 +46,38 @@ void AssocGenPage::constructWidget() { // general configuration of the GUI int margin = fontMetrics().height(); setMinimumSize(310,330); - QVBoxLayout * topLayout = new QVBoxLayout(this); + TQVBoxLayout * topLayout = new TQVBoxLayout(this); topLayout -> setSpacing(6); // group boxes for name, documentation properties - QGroupBox *nameGB = new QGroupBox(this); - QGroupBox *docGB = new QGroupBox(this); + TQGroupBox *nameGB = new TQGroupBox(this); + TQGroupBox *docGB = new TQGroupBox(this); nameGB -> setTitle(i18n("Properties")); docGB -> setTitle(i18n("Documentation")); topLayout -> addWidget(nameGB); topLayout -> addWidget(docGB); - QGridLayout * nameLayout = new QGridLayout(nameGB, 2, 2); + TQGridLayout * nameLayout = new TQGridLayout(nameGB, 2, 2); nameLayout -> setSpacing(6); nameLayout -> setMargin(margin); //Association name - QLabel *pAssocNameL = NULL; - QLineEdit* nameField = Dialog_Utils::makeLabeledEditField( nameGB, nameLayout, 0, + TQLabel *pAssocNameL = NULL; + TQLineEdit* nameField = Dialog_Utils::makeLabeledEditField( nameGB, nameLayout, 0, pAssocNameL, i18n("Name:"), m_pAssocNameLE, m_pAssociationWidget->getName() ); nameField->setFocus(); // document - QHBoxLayout * docLayout = new QHBoxLayout(docGB); + TQHBoxLayout * docLayout = new TQHBoxLayout(docGB); docLayout -> setMargin(margin); - m_pDoc = new QMultiLineEdit(docGB); + m_pDoc = new TQMultiLineEdit(docGB); docLayout -> addWidget(m_pDoc); m_pDoc-> setText(m_pAssociationWidget-> getDoc()); Uml::Association_Type currentType = m_pAssociationWidget->getAssocType(); - QString currentTypeAsString = UMLAssociation::typeAsString(currentType); - QLabel *pTypeL = new QLabel(i18n("Type:"), nameGB); + TQString currentTypeAsString = UMLAssociation::typeAsString(currentType); + TQLabel *pTypeL = new TQLabel(i18n("Type:"), nameGB); nameLayout->addWidget(pTypeL, 1, 0); /* Here is a list of all the supported choices for changing @@ -90,7 +90,7 @@ void AssocGenPage::constructWidget() { m_AssocTypeStrings.clear(); for (uint i=0; i<m_AssocTypes.size(); ++i) { if (m_AssocTypes[i] == currentType) found=true; - QString typeStr = UMLAssociation::typeAsString(m_AssocTypes[i]); + TQString typeStr = UMLAssociation::typeAsString(m_AssocTypes[i]); m_AssocTypeStrings << typeStr; } @@ -108,7 +108,7 @@ void AssocGenPage::constructWidget() { m_pTypeCB->setCurrentText(currentTypeAsString); m_pTypeCB->setDuplicatesEnabled(false);//only allow one of each type in box m_pTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup ); - m_pDoc->setWordWrap(QMultiLineEdit::WidgetWidth); + m_pDoc->setWordWrap(TQMultiLineEdit::WidgetWidth); nameLayout->addWidget(m_pTypeCB, 1, 1); diff --git a/umbrello/umbrello/dialogs/assocgenpage.h b/umbrello/umbrello/dialogs/assocgenpage.h index 3eff137f..4cd34421 100644 --- a/umbrello/umbrello/dialogs/assocgenpage.h +++ b/umbrello/umbrello/dialogs/assocgenpage.h @@ -13,15 +13,15 @@ #define ASSOCGENPAGE_H //quicktime class includes -#include <qwidget.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qbuttongroup.h> -#include <qmultilineedit.h> -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qvaluelist.h> +#include <tqwidget.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqbuttongroup.h> +#include <tqmultilineedit.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqvaluelist.h> //my class includes #include "../umlobject.h" @@ -40,7 +40,7 @@ class KComboBox; * @author Paul Hensgen <phensgen@techie.com> * Bugs and comments to uml-devel@lists.sf.net or http://bugs.kde.org */ -class AssocGenPage : public QWidget { +class AssocGenPage : public TQWidget { Q_OBJECT public: @@ -51,7 +51,7 @@ public: * @param parent The parent to the AssocGenPage. * @param a The AssociationWidget to display the properties of. */ - AssocGenPage(UMLDoc *d, QWidget *parent, AssociationWidget *a); + AssocGenPage(UMLDoc *d, TQWidget *parent, AssociationWidget *a); /** * Standard deconstructor. @@ -65,15 +65,15 @@ public: void updateObject(); private: - QLineEdit * m_pAssocNameLE; + TQLineEdit * m_pAssocNameLE; KComboBox *m_pTypeCB; - /* Choices for the QComboBox, and we store ints and strings + /* Choices for the TQComboBox, and we store ints and strings so we can translate both ways */ - QValueList<Uml::Association_Type> m_AssocTypes; - QStringList m_AssocTypeStrings; + TQValueList<Uml::Association_Type> m_AssocTypes; + TQStringList m_AssocTypeStrings; - QMultiLineEdit * m_pDoc; + TQMultiLineEdit * m_pDoc; AssociationWidget *m_pAssociationWidget; UMLDoc * m_pUmldoc; diff --git a/umbrello/umbrello/dialogs/assocpage.cpp b/umbrello/umbrello/dialogs/assocpage.cpp index 1b3cf5ad..feb193eb 100644 --- a/umbrello/umbrello/dialogs/assocpage.cpp +++ b/umbrello/umbrello/dialogs/assocpage.cpp @@ -10,53 +10,53 @@ ***************************************************************************/ #include "assocpage.h" -#include <qlayout.h> +#include <tqlayout.h> #include <klocale.h> #include "assocpropdlg.h" -AssocPage::AssocPage(QWidget *parent, UMLView * v, UMLObject * o) : QWidget(parent) { +AssocPage::AssocPage(TQWidget *parent, UMLView * v, UMLObject * o) : TQWidget(parent) { m_pObject = o; m_pView = v; int margin = fontMetrics().height(); - QHBoxLayout * mainLayout = new QHBoxLayout(this); + TQHBoxLayout * mainLayout = new TQHBoxLayout(this); mainLayout -> setSpacing(10); - m_pAssocGB = new QGroupBox(i18n("Associations"), this); + m_pAssocGB = new TQGroupBox(i18n("Associations"), this); mainLayout -> addWidget(m_pAssocGB); - QHBoxLayout * layout = new QHBoxLayout(m_pAssocGB); + TQHBoxLayout * layout = new TQHBoxLayout(m_pAssocGB); layout -> setSpacing(10); layout -> setMargin(margin); - m_pAssocLB = new QListBox(m_pAssocGB); + m_pAssocLB = new TQListBox(m_pAssocGB); layout -> addWidget(m_pAssocLB); setMinimumSize(310, 330); fillListBox(); m_pMenu = 0; - connect(m_pAssocLB, SIGNAL(doubleClicked(QListBoxItem *)), - this, SLOT(slotDoubleClick(QListBoxItem *))); + connect(m_pAssocLB, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), + this, TQT_SLOT(slotDoubleClick(TQListBoxItem *))); - connect(m_pAssocLB, SIGNAL(rightButtonPressed(QListBoxItem *, const QPoint &)), - this, SLOT(slotRightButtonPressed(QListBoxItem *, const QPoint &))); + connect(m_pAssocLB, TQT_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), + this, TQT_SLOT(slotRightButtonPressed(TQListBoxItem *, const TQPoint &))); - connect(m_pAssocLB, SIGNAL(rightButtonClicked(QListBoxItem *, const QPoint &)), - this, SLOT(slotRightButtonClicked(QListBoxItem *, const QPoint &))); + connect(m_pAssocLB, TQT_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), + this, TQT_SLOT(slotRightButtonClicked(TQListBoxItem *, const TQPoint &))); } AssocPage::~AssocPage() { - disconnect(m_pAssocLB, SIGNAL(doubleClicked(QListBoxItem *)), - this, SLOT(slotDoubleClick(QListBoxItem *))); + disconnect(m_pAssocLB, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), + this, TQT_SLOT(slotDoubleClick(TQListBoxItem *))); - disconnect(m_pAssocLB, SIGNAL(rightButtonPressed(QListBoxItem *, const QPoint &)), - this, SLOT(slotRightButtonPressed(QListBoxItem *, const QPoint &))); + disconnect(m_pAssocLB, TQT_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), + this, TQT_SLOT(slotRightButtonPressed(TQListBoxItem *, const TQPoint &))); - disconnect(m_pAssocLB, SIGNAL(rightButtonClicked(QListBoxItem *, const QPoint &)), - this, SLOT(slotRightButtonClicked(QListBoxItem *, const QPoint &))); + disconnect(m_pAssocLB, TQT_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), + this, TQT_SLOT(slotRightButtonClicked(TQListBoxItem *, const TQPoint &))); } -void AssocPage::slotDoubleClick(QListBoxItem * i) { +void AssocPage::slotDoubleClick(TQListBoxItem * i) { if(!i) return; @@ -84,27 +84,27 @@ void AssocPage::fillListBox() { } } -void AssocPage::slotRightButtonClicked(QListBoxItem */* item*/, const QPoint &/* p*/) { +void AssocPage::slotRightButtonClicked(TQListBoxItem */* item*/, const TQPoint &/* p*/) { if(m_pMenu) { m_pMenu -> hide(); - disconnect(m_pMenu, SIGNAL(activated(int)), this, SLOT(slotPopupMenuSel(int))); + disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } } -void AssocPage::slotRightButtonPressed(QListBoxItem * item, const QPoint & p) { +void AssocPage::slotRightButtonPressed(TQListBoxItem * item, const TQPoint & p) { if(!item) return; if(m_pMenu) { m_pMenu -> hide(); - disconnect(m_pMenu, SIGNAL(activated(int)), this, SLOT(slotPopupMenuSel(int))); + disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } m_pMenu = new ListPopupMenu(this, ListPopupMenu::mt_Association_Selected); m_pMenu->popup(p); - connect(m_pMenu, SIGNAL(activated(int)), this, SLOT(slotPopupMenuSel(int))); + connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); } void AssocPage::slotPopupMenuSel(int id) { diff --git a/umbrello/umbrello/dialogs/assocpage.h b/umbrello/umbrello/dialogs/assocpage.h index 60e1e339..a38aa2ac 100644 --- a/umbrello/umbrello/dialogs/assocpage.h +++ b/umbrello/umbrello/dialogs/assocpage.h @@ -13,10 +13,10 @@ #ifndef ASSOCPAGE_H #define ASSOCPAGE_H -#include <qwidget.h> -#include <qgroupbox.h> -#include <qlistbox.h> -#include <qptrlist.h> +#include <tqwidget.h> +#include <tqgroupbox.h> +#include <tqlistbox.h> +#include <tqptrlist.h> #include "../umlobject.h" #include "../umlview.h" @@ -38,7 +38,7 @@ * @author Paul Hensgen <phensgen@techie.com> * Bugs and comments to uml-devel@lists.sf.net or http://bugs.kde.org */ -class AssocPage : public QWidget { +class AssocPage : public TQWidget { Q_OBJECT public: /** @@ -48,7 +48,7 @@ public: * @param v The view the UMLObject being represented. * @param o The UMLObject being represented */ - AssocPage(QWidget *parent, UMLView * v, UMLObject * o); + AssocPage(TQWidget *parent, UMLView * v, UMLObject * o); /** * Standard deconstructor. @@ -57,8 +57,8 @@ public: private: UMLObject * m_pObject; UMLView * m_pView; - QListBox * m_pAssocLB; - QGroupBox * m_pAssocGB; + TQListBox * m_pAssocLB; + TQGroupBox * m_pAssocGB; AssociationWidgetList m_List; ListPopupMenu * m_pMenu; @@ -67,9 +67,9 @@ private: */ void fillListBox(); public slots: - void slotDoubleClick(QListBoxItem * i); - void slotRightButtonClicked(QListBoxItem */* item*/, const QPoint &/* p*/); - void slotRightButtonPressed(QListBoxItem * item, const QPoint & p); + void slotDoubleClick(TQListBoxItem * i); + void slotRightButtonClicked(TQListBoxItem */* item*/, const TQPoint &/* p*/); + void slotRightButtonPressed(TQListBoxItem * item, const TQPoint & p); void slotPopupMenuSel(int id); }; diff --git a/umbrello/umbrello/dialogs/assocpropdlg.cpp b/umbrello/umbrello/dialogs/assocpropdlg.cpp index 2458da13..1d5b9c77 100644 --- a/umbrello/umbrello/dialogs/assocpropdlg.cpp +++ b/umbrello/umbrello/dialogs/assocpropdlg.cpp @@ -13,8 +13,8 @@ #include "assocpropdlg.h" // qt/kde includes -#include <qlayout.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqlabel.h> #include <klocale.h> #include <kmessagebox.h> @@ -35,7 +35,7 @@ #include "../umlview.h" -AssocPropDlg::AssocPropDlg (QWidget *parent, AssociationWidget * assocWidget, int pageNum) +AssocPropDlg::AssocPropDlg (TQWidget *parent, AssociationWidget * assocWidget, int pageNum) : KDialogBase(IconList, i18n("Association Properties"), Ok | Apply | Cancel | Help, Ok, parent, "_ASSOCPROPDLG_", true, true) { @@ -84,15 +84,15 @@ void AssocPropDlg::setupPages (AssociationWidget *assocWidget) { // general page - QFrame *page = addPage( i18n("General"), i18n("General Settings"), DesktopIcon( "misc") ); - QHBoxLayout *genLayout = new QHBoxLayout(page); + TQFrame *page = addPage( i18n("General"), i18n("General Settings"), DesktopIcon( "misc") ); + TQHBoxLayout *genLayout = new TQHBoxLayout(page); page -> setMinimumSize(310, 330); m_pGenPage = new AssocGenPage (m_pDoc, page, assocWidget); genLayout -> addWidget(m_pGenPage); // role page - QFrame * newPage = addPage( i18n("Roles"), i18n("Role Settings"), DesktopIcon( "misc") ); - QHBoxLayout * roleLayout = new QHBoxLayout(newPage); + TQFrame * newPage = addPage( i18n("Roles"), i18n("Role Settings"), DesktopIcon( "misc") ); + TQHBoxLayout * roleLayout = new TQHBoxLayout(newPage); // newPage -> setMinimumSize(310, 330); m_pRolePage = new AssocRolePage(m_pDoc, newPage, assocWidget); roleLayout -> addWidget(m_pRolePage); @@ -106,8 +106,8 @@ void AssocPropDlg::setupFontPage() if( !m_pAssoc) return; - QVBox *page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts")); - m_pChooser = new KFontChooser( (QWidget*)page, "font", false, QStringList(), false); + TQVBox *page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts")); + m_pChooser = new KFontChooser( (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 a5bdad6e..8fbbebe8 100644 --- a/umbrello/umbrello/dialogs/assocpropdlg.h +++ b/umbrello/umbrello/dialogs/assocpropdlg.h @@ -40,7 +40,7 @@ public: * @param pageNum The page to show first. */ - AssocPropDlg(QWidget *parent, AssociationWidget *a, int pageNum = 0); + AssocPropDlg(TQWidget *parent, AssociationWidget *a, int pageNum = 0); /** * Standard deconstructor diff --git a/umbrello/umbrello/dialogs/assocrolepage.cpp b/umbrello/umbrello/dialogs/assocrolepage.cpp index 807a7e1e..adb7dcc3 100644 --- a/umbrello/umbrello/dialogs/assocrolepage.cpp +++ b/umbrello/umbrello/dialogs/assocrolepage.cpp @@ -13,7 +13,7 @@ #include "assocrolepage.h" // qt includes -#include <qlayout.h> +#include <tqlayout.h> // kde includes #include <klocale.h> @@ -23,8 +23,8 @@ // local includes #include "../dialog_utils.h" -AssocRolePage::AssocRolePage (UMLDoc *d, QWidget *parent, AssociationWidget *assoc) - : QWidget(parent) +AssocRolePage::AssocRolePage (UMLDoc *d, TQWidget *parent, AssociationWidget *assoc) + : TQWidget(parent) { m_pAssociationWidget = assoc; @@ -45,12 +45,12 @@ AssocRolePage::~AssocRolePage() {} void AssocRolePage::constructWidget() { // underlying roles and objects - QString nameA = m_pAssociationWidget->getRoleName(Uml::A); - QString nameB = m_pAssociationWidget->getRoleName(Uml::B); - QString titleA = i18n("Role A Properties"); - QString titleB = i18n("Role B Properties"); - QString widgetNameA = m_pAssociationWidget->getWidget(Uml::A)->getName(); - QString widgetNameB = m_pAssociationWidget->getWidget(Uml::B)->getName(); + TQString nameA = m_pAssociationWidget->getRoleName(Uml::A); + TQString nameB = m_pAssociationWidget->getRoleName(Uml::B); + TQString titleA = i18n("Role A Properties"); + TQString titleB = i18n("Role B Properties"); + TQString widgetNameA = m_pAssociationWidget->getWidget(Uml::A)->getName(); + TQString widgetNameB = m_pAssociationWidget->getWidget(Uml::B)->getName(); if(!widgetNameA.isEmpty()) titleA.append(" (" + widgetNameA + ')'); if(!widgetNameB.isEmpty()) @@ -59,28 +59,28 @@ void AssocRolePage::constructWidget() { // general configuration of the GUI int margin = fontMetrics().height(); - QGridLayout * mainLayout = new QGridLayout(this, 4, 2); + TQGridLayout * mainLayout = new TQGridLayout(this, 4, 2); mainLayout -> setSpacing(6); // group boxes for role, documentation properties - QGroupBox *propsAGB = new QGroupBox(this); - QGroupBox *propsBGB = new QGroupBox(this); - QButtonGroup * scopeABG = new QButtonGroup(i18n("Role A Visibility"), this ); - QButtonGroup * scopeBBG = new QButtonGroup(i18n("Role B Visibility"), this ); - QButtonGroup * changeABG = new QButtonGroup(i18n("Role A Changeability"), this ); - QButtonGroup * changeBBG = new QButtonGroup(i18n("Role B Changeability"), this ); - QGroupBox *docAGB = new QGroupBox(this); - QGroupBox *docBGB = new QGroupBox(this); + TQGroupBox *propsAGB = new TQGroupBox(this); + TQGroupBox *propsBGB = new TQGroupBox(this); + TQButtonGroup * scopeABG = new TQButtonGroup(i18n("Role A Visibility"), this ); + TQButtonGroup * scopeBBG = new TQButtonGroup(i18n("Role B Visibility"), this ); + TQButtonGroup * changeABG = new TQButtonGroup(i18n("Role A Changeability"), this ); + TQButtonGroup * changeBBG = new TQButtonGroup(i18n("Role B Changeability"), this ); + TQGroupBox *docAGB = new TQGroupBox(this); + TQGroupBox *docBGB = new TQGroupBox(this); propsAGB -> setTitle(titleA); propsBGB -> setTitle(titleB); docAGB -> setTitle(i18n("Documentation")); docBGB -> setTitle(i18n("Documentation")); - QGridLayout * propsALayout = new QGridLayout(propsAGB, 2, 2); + TQGridLayout * propsALayout = new TQGridLayout(propsAGB, 2, 2); propsALayout -> setSpacing(6); propsALayout -> setMargin(margin); - QGridLayout * propsBLayout = new QGridLayout(propsBGB, 3, 2); + TQGridLayout * propsBLayout = new TQGridLayout(propsBGB, 3, 2); propsBLayout -> setSpacing(6); propsBLayout -> setMargin(margin); @@ -88,31 +88,31 @@ void AssocRolePage::constructWidget() { // // Rolename A - QLabel *pRoleAL = NULL; + TQLabel *pRoleAL = NULL; Dialog_Utils::makeLabeledEditField( propsAGB, propsALayout, 0, pRoleAL, i18n("Rolename:"), m_pRoleALE, nameA ); // Multi A - QLabel *pMultiAL = NULL; + TQLabel *pMultiAL = NULL; Dialog_Utils::makeLabeledEditField( propsAGB, propsALayout, 1, pMultiAL, i18n("Multiplicity:"), m_pMultiALE, m_pAssociationWidget->getMulti(Uml::A) ); // Visibility A - QHBoxLayout * scopeALayout = new QHBoxLayout(scopeABG); + TQHBoxLayout * scopeALayout = new TQHBoxLayout(scopeABG); scopeALayout -> setMargin(margin); - m_PublicARB = new QRadioButton(i18n("Public"), scopeABG); + m_PublicARB = new TQRadioButton(i18n("Public"), scopeABG); scopeALayout -> addWidget(m_PublicARB); - m_PrivateARB = new QRadioButton(i18n("Private"), scopeABG); + m_PrivateARB = new TQRadioButton(i18n("Private"), scopeABG); scopeALayout -> addWidget(m_PrivateARB); - m_ProtectedARB = new QRadioButton(i18n("Protected"), scopeABG); + m_ProtectedARB = new TQRadioButton(i18n("Protected"), scopeABG); scopeALayout -> addWidget(m_ProtectedARB); - m_ImplementationARB = new QRadioButton(i18n("Implementation"), scopeABG); + m_ImplementationARB = new TQRadioButton(i18n("Implementation"), scopeABG); scopeALayout -> addWidget(m_ImplementationARB); Uml::Visibility scope = m_pAssociationWidget->getVisibility(Uml::A); @@ -126,16 +126,16 @@ void AssocRolePage::constructWidget() { m_ProtectedARB -> setChecked( true ); // Changeability A - QHBoxLayout * changeALayout = new QHBoxLayout(changeABG); + TQHBoxLayout * changeALayout = new TQHBoxLayout(changeABG); changeALayout -> setMargin(margin); - m_ChangeableARB = new QRadioButton(i18n("Changeable"), changeABG); + m_ChangeableARB = new TQRadioButton(i18n("Changeable"), changeABG); changeALayout -> addWidget(m_ChangeableARB); - m_FrozenARB = new QRadioButton(i18n("Frozen"), changeABG); + m_FrozenARB = new TQRadioButton(i18n("Frozen"), changeABG); changeALayout -> addWidget(m_FrozenARB); - m_AddOnlyARB = new QRadioButton(i18n("Add only"), changeABG); + m_AddOnlyARB = new TQRadioButton(i18n("Add only"), changeABG); changeALayout -> addWidget(m_AddOnlyARB); Uml::Changeability_Type changeability = m_pAssociationWidget->getChangeability(Uml::A); @@ -147,32 +147,32 @@ void AssocRolePage::constructWidget() { m_AddOnlyARB -> setChecked( true ); // Rolename B - QLabel * pRoleBL = NULL; + TQLabel * pRoleBL = NULL; Dialog_Utils::makeLabeledEditField( propsBGB, propsBLayout, 0, pRoleBL, i18n("Rolename:"), m_pRoleBLE, nameB ); // Multi B - QLabel * pMultiBL = NULL; + TQLabel * pMultiBL = NULL; Dialog_Utils::makeLabeledEditField( propsBGB, propsBLayout, 1, pMultiBL, i18n("Multiplicity:"), m_pMultiBLE, m_pAssociationWidget->getMulti(Uml::B) ); // Visibility B - QHBoxLayout * scopeBLayout = new QHBoxLayout(scopeBBG); + TQHBoxLayout * scopeBLayout = new TQHBoxLayout(scopeBBG); scopeBLayout -> setMargin(margin); - m_PublicBRB = new QRadioButton(i18n("Public"), scopeBBG); + m_PublicBRB = new TQRadioButton(i18n("Public"), scopeBBG); scopeBLayout -> addWidget(m_PublicBRB); - m_PrivateBRB = new QRadioButton(i18n("Private"), scopeBBG); + m_PrivateBRB = new TQRadioButton(i18n("Private"), scopeBBG); scopeBLayout -> addWidget(m_PrivateBRB); - m_ProtectedBRB = new QRadioButton(i18n("Protected"), scopeBBG); + m_ProtectedBRB = new TQRadioButton(i18n("Protected"), scopeBBG); scopeBLayout -> addWidget(m_ProtectedBRB); - m_ImplementationBRB = new QRadioButton(i18n("Implementation"), scopeBBG); + m_ImplementationBRB = new TQRadioButton(i18n("Implementation"), scopeBBG); scopeBLayout -> addWidget(m_ImplementationBRB); scope = m_pAssociationWidget->getVisibility(Uml::B); @@ -186,16 +186,16 @@ void AssocRolePage::constructWidget() { m_ImplementationBRB -> setChecked( true ); // Changeability B - QHBoxLayout * changeBLayout = new QHBoxLayout(changeBBG); + TQHBoxLayout * changeBLayout = new TQHBoxLayout(changeBBG); changeBLayout -> setMargin(margin); - m_ChangeableBRB = new QRadioButton(i18n("Changeable"), changeBBG); + m_ChangeableBRB = new TQRadioButton(i18n("Changeable"), changeBBG); changeBLayout -> addWidget(m_ChangeableBRB); - m_FrozenBRB = new QRadioButton(i18n("Frozen"), changeBBG); + m_FrozenBRB = new TQRadioButton(i18n("Frozen"), changeBBG); changeBLayout -> addWidget(m_FrozenBRB); - m_AddOnlyBRB = new QRadioButton(i18n("Add only"), changeBBG); + m_AddOnlyBRB = new TQRadioButton(i18n("Add only"), changeBBG); changeBLayout -> addWidget(m_AddOnlyBRB); changeability = m_pAssociationWidget->getChangeability(Uml::B); @@ -210,23 +210,23 @@ void AssocRolePage::constructWidget() { // // Document A - QHBoxLayout * docALayout = new QHBoxLayout(docAGB); + TQHBoxLayout * docALayout = new TQHBoxLayout(docAGB); docALayout -> setMargin(margin); - m_pDocA = new QMultiLineEdit(docAGB); + m_pDocA = new TQMultiLineEdit(docAGB); docALayout -> addWidget(m_pDocA); m_pDocA-> setText(m_pAssociationWidget-> getRoleDoc(Uml::A)); // m_pDocA-> setText("<<not implemented yet>>"); // m_pDocA-> setEnabled(false); - m_pDocA->setWordWrap(QMultiLineEdit::WidgetWidth); + m_pDocA->setWordWrap(TQMultiLineEdit::WidgetWidth); // Document B - QHBoxLayout * docBLayout = new QHBoxLayout(docBGB); + TQHBoxLayout * docBLayout = new TQHBoxLayout(docBGB); docBLayout -> setMargin(margin); - m_pDocB = new QMultiLineEdit(docBGB); + m_pDocB = new TQMultiLineEdit(docBGB); docBLayout -> addWidget(m_pDocB); m_pDocB-> setText(m_pAssociationWidget-> getRoleDoc(Uml::B)); // m_pDocB-> setEnabled(false); - m_pDocB->setWordWrap(QMultiLineEdit::WidgetWidth); + m_pDocB->setWordWrap(TQMultiLineEdit::WidgetWidth); // add group boxes to main layout mainLayout -> addWidget( propsAGB, 0, 0); diff --git a/umbrello/umbrello/dialogs/assocrolepage.h b/umbrello/umbrello/dialogs/assocrolepage.h index c1c4d603..440707cc 100644 --- a/umbrello/umbrello/dialogs/assocrolepage.h +++ b/umbrello/umbrello/dialogs/assocrolepage.h @@ -13,14 +13,14 @@ #define ASSOCROLEPAGE_H //quicktime class includes -#include <qwidget.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qbuttongroup.h> -#include <qmultilineedit.h> -#include <qradiobutton.h> -#include <qcheckbox.h> +#include <tqwidget.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqbuttongroup.h> +#include <tqmultilineedit.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> //my class includes #include "../umlobject.h" @@ -36,7 +36,7 @@ * @author Paul Hensgen <phensgen@techie.com> * Bugs and comments to uml-devel@lists.sf.net or http://bugs.kde.org */ -class AssocRolePage : public QWidget { +class AssocRolePage : public TQWidget { Q_OBJECT public: @@ -47,7 +47,7 @@ public: * @param parent The parent to the AssocRolePage. * @param a The AssociationWidget to display the properties of. */ - AssocRolePage(UMLDoc *d, QWidget *parent, AssociationWidget *a); + AssocRolePage(UMLDoc *d, TQWidget *parent, AssociationWidget *a); /** * Standard deconstructor. @@ -61,15 +61,15 @@ public: void updateObject(); private: - QLineEdit *m_pRoleALE, *m_pRoleBLE, *m_pMultiALE, *m_pMultiBLE; - QMultiLineEdit *m_pDocA, *m_pDocB; + TQLineEdit *m_pRoleALE, *m_pRoleBLE, *m_pMultiALE, *m_pMultiBLE; + TQMultiLineEdit *m_pDocA, *m_pDocB; AssociationWidget *m_pAssociationWidget; UMLDoc * m_pUmldoc; ObjectWidget *m_pWidget; - QRadioButton *m_PublicARB, *m_ProtectedARB, *m_PrivateARB, *m_ImplementationARB; - QRadioButton *m_PublicBRB, *m_ProtectedBRB, *m_PrivateBRB, *m_ImplementationBRB; - QRadioButton *m_ChangeableARB, *m_AddOnlyARB, *m_FrozenARB; - QRadioButton *m_ChangeableBRB, *m_AddOnlyBRB, *m_FrozenBRB; + TQRadioButton *m_PublicARB, *m_ProtectedARB, *m_PrivateARB, *m_ImplementationARB; + TQRadioButton *m_PublicBRB, *m_ProtectedBRB, *m_PrivateBRB, *m_ImplementationBRB; + TQRadioButton *m_ChangeableARB, *m_AddOnlyARB, *m_FrozenARB; + TQRadioButton *m_ChangeableBRB, *m_AddOnlyBRB, *m_FrozenBRB; void constructWidget(); diff --git a/umbrello/umbrello/dialogs/classgenpage.cpp b/umbrello/umbrello/dialogs/classgenpage.cpp index 01b3d3c7..d633b6ae 100644 --- a/umbrello/umbrello/dialogs/classgenpage.cpp +++ b/umbrello/umbrello/dialogs/classgenpage.cpp @@ -13,14 +13,14 @@ #include "classgenpage.h" // qt includes -#include <qlayout.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qbuttongroup.h> -#include <qmultilineedit.h> -#include <qradiobutton.h> -#include <qcheckbox.h> +#include <tqlayout.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqbuttongroup.h> +#include <tqmultilineedit.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> // kde includes #include <klocale.h> @@ -38,11 +38,11 @@ #include "../umlview.h" #include "../stereotype.h" -ClassGenPage::ClassGenPage(UMLDoc* d, QWidget* parent, UMLObject* o) : QWidget(parent) { +ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, UMLObject* o) : TQWidget(parent) { m_pWidget = 0; m_pObject = 0; m_pInstanceWidget = 0; - QString name; + TQString name; int margin = fontMetrics().height(); Uml::Object_Type t = o -> getBaseType(); m_pUmldoc = d; @@ -70,17 +70,17 @@ ClassGenPage::ClassGenPage(UMLDoc* d, QWidget* parent, UMLObject* o) : QWidget(p kWarning() << "creating class gen page for unknown widget type" << endl; } setMinimumSize(310,330); - QVBoxLayout * topLayout = new QVBoxLayout(this); + TQVBoxLayout * topLayout = new TQVBoxLayout(this); topLayout -> setSpacing(6); //setup name - QGridLayout * m_pNameLayout = new QGridLayout(topLayout, 4, 2); + TQGridLayout * m_pNameLayout = new TQGridLayout(topLayout, 4, 2); m_pNameLayout -> setSpacing(6); - m_pNameL = new QLabel(this); + m_pNameL = new TQLabel(this); m_pNameL -> setText(name); m_pNameLayout -> addWidget(m_pNameL, 0, 0); - m_pClassNameLE = new QLineEdit(this); + m_pClassNameLE = new TQLineEdit(this); m_pNameLayout -> addWidget(m_pClassNameLE, 0, 1); m_pClassNameLE->setFocus(); m_pNameL->setBuddy(m_pClassNameLE); @@ -90,7 +90,7 @@ ClassGenPage::ClassGenPage(UMLDoc* d, QWidget* parent, UMLObject* o) : QWidget(p m_pAbstractCB = 0; m_pDeconCB = 0; - m_pStereoTypeL = new QLabel(i18n("&Stereotype name:"), this); + m_pStereoTypeL = new TQLabel(i18n("&Stereotype name:"), this); m_pNameLayout -> addWidget(m_pStereoTypeL, 1, 0); m_pStereoTypeCB = new KComboBox(true, this); @@ -104,10 +104,10 @@ ClassGenPage::ClassGenPage(UMLDoc* d, QWidget* parent, UMLObject* o) : QWidget(p } if (t == Uml::ot_Class || t == Uml::ot_Interface) { - m_pPackageL = new QLabel(i18n("&Package name:"), this); + m_pPackageL = new TQLabel(i18n("&Package name:"), this); m_pNameLayout -> addWidget(m_pPackageL, 2, 0); - m_pPackageLE = new QLineEdit(this); + m_pPackageLE = new TQLineEdit(this); m_pNameLayout -> addWidget(m_pPackageLE, 2, 1); m_pPackageLE -> setText(o -> getPackage()); @@ -116,40 +116,40 @@ ClassGenPage::ClassGenPage(UMLDoc* d, QWidget* parent, UMLObject* o) : QWidget(p } if (t == Uml::ot_Class || t == Uml::ot_UseCase ) { - QString abstractCaption; + TQString abstractCaption; if ( t == Uml::ot_Class ) { abstractCaption = i18n("A&bstract class"); } else { abstractCaption = i18n("A&bstract use case"); } - m_pAbstractCB = new QCheckBox( abstractCaption, this ); + m_pAbstractCB = new TQCheckBox( abstractCaption, this ); m_pAbstractCB -> setChecked( o -> getAbstract() ); m_pNameLayout -> addWidget( m_pAbstractCB, 3, 0 ); } if (t == Uml::ot_Component) { - m_pExecutableCB = new QCheckBox(i18n("&Executable"), this); + m_pExecutableCB = new TQCheckBox(i18n("&Executable"), this); m_pExecutableCB->setChecked( (static_cast<UMLComponent*>(o))->getExecutable() ); m_pNameLayout->addWidget( m_pExecutableCB, 3, 0 ); } if (t == Uml::ot_Artifact) { //setup artifact draw as - m_pDrawAsBG = new QButtonGroup(i18n("Draw As"), this); - QHBoxLayout* drawAsLayout = new QHBoxLayout(m_pDrawAsBG); + m_pDrawAsBG = new TQButtonGroup(i18n("Draw As"), this); + TQHBoxLayout* drawAsLayout = new TQHBoxLayout(m_pDrawAsBG); drawAsLayout->setMargin(margin); m_pDrawAsBG->setExclusive(true); - m_pDefaultRB = new QRadioButton(i18n("&Default"), m_pDrawAsBG); + m_pDefaultRB = new TQRadioButton(i18n("&Default"), m_pDrawAsBG); drawAsLayout->addWidget(m_pDefaultRB); - m_pFileRB = new QRadioButton(i18n("&File"), m_pDrawAsBG); + m_pFileRB = new TQRadioButton(i18n("&File"), m_pDrawAsBG); drawAsLayout->addWidget(m_pFileRB); - m_pLibraryRB = new QRadioButton(i18n("&Library"), m_pDrawAsBG); + m_pLibraryRB = new TQRadioButton(i18n("&Library"), m_pDrawAsBG); drawAsLayout->addWidget(m_pLibraryRB); - m_pTableRB = new QRadioButton(i18n("&Table"), m_pDrawAsBG); + m_pTableRB = new TQRadioButton(i18n("&Table"), m_pDrawAsBG); drawAsLayout->addWidget(m_pTableRB); topLayout->addWidget(m_pDrawAsBG); @@ -168,31 +168,31 @@ ClassGenPage::ClassGenPage(UMLDoc* d, QWidget* parent, UMLObject* o) : QWidget(p } //setup scope - m_pButtonBG = new QButtonGroup(i18n("Visibility"), this); - QHBoxLayout * scopeLayout = new QHBoxLayout(m_pButtonBG); + m_pButtonBG = new TQButtonGroup(i18n("Visibility"), this); + TQHBoxLayout * scopeLayout = new TQHBoxLayout(m_pButtonBG); scopeLayout -> setMargin(margin); m_pButtonBG -> setExclusive(true); - m_pPublicRB = new QRadioButton(i18n("P&ublic"), m_pButtonBG); + m_pPublicRB = new TQRadioButton(i18n("P&ublic"), m_pButtonBG); scopeLayout -> addWidget(m_pPublicRB); - m_pPrivateRB = new QRadioButton(i18n("P&rivate"), m_pButtonBG); + m_pPrivateRB = new TQRadioButton(i18n("P&rivate"), m_pButtonBG); scopeLayout -> addWidget(m_pPrivateRB); - m_pProtectedRB = new QRadioButton(i18n("Pro&tected"), m_pButtonBG); + m_pProtectedRB = new TQRadioButton(i18n("Pro&tected"), m_pButtonBG); scopeLayout -> addWidget(m_pProtectedRB); topLayout -> addWidget(m_pButtonBG); - m_pImplementationRB = new QRadioButton(i18n("Imple&mentation"), m_pButtonBG); + m_pImplementationRB = new TQRadioButton(i18n("Imple&mentation"), m_pButtonBG); scopeLayout -> addWidget(m_pImplementationRB); topLayout -> addWidget(m_pButtonBG); //setup documentation - m_pDocGB = new QGroupBox(this); - QHBoxLayout * docLayout = new QHBoxLayout(m_pDocGB); + m_pDocGB = new TQGroupBox(this); + TQHBoxLayout * docLayout = new TQHBoxLayout(m_pDocGB); docLayout -> setMargin(margin); m_pDocGB -> setTitle(i18n("Documentation")); - m_pDoc = new QMultiLineEdit(m_pDocGB); + m_pDoc = new TQMultiLineEdit(m_pDocGB); docLayout -> addWidget(m_pDoc); topLayout -> addWidget(m_pDocGB); @@ -213,7 +213,7 @@ ClassGenPage::ClassGenPage(UMLDoc* d, QWidget* parent, UMLObject* o) : QWidget(p // manage stereotypes m_pStereoTypeCB -> setDuplicatesEnabled(false);//only allow one of each type in box m_pStereoTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup ); - insertStereotype (QString("")); // an empty stereotype is the default + insertStereotype (TQString("")); // an empty stereotype is the default int defaultStereotype=0; bool foundDefaultStereotype = false; for (UMLStereotypeListIt it(m_pUmldoc->getStereotypes()); it.current(); ++it) { @@ -232,11 +232,11 @@ ClassGenPage::ClassGenPage(UMLDoc* d, QWidget* parent, UMLObject* o) : QWidget(p m_pStereoTypeCB -> setCurrentItem(-1); /////////// - m_pDoc->setWordWrap(QMultiLineEdit::WidgetWidth); + m_pDoc->setWordWrap(TQMultiLineEdit::WidgetWidth); ////////// } -ClassGenPage::ClassGenPage(UMLDoc* d, QWidget* parent, ObjectWidget* o) : QWidget(parent) { +ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, ObjectWidget* o) : TQWidget(parent) { m_pObject = 0; m_pInstanceWidget = 0; m_pWidget = o; @@ -246,62 +246,62 @@ ClassGenPage::ClassGenPage(UMLDoc* d, QWidget* parent, ObjectWidget* o) : QWidge //int t = o -> getBaseType(); m_pUmldoc = d; setMinimumSize(310,330); - QGridLayout * topLayout = new QGridLayout(this, 2, 1); + TQGridLayout * topLayout = new TQGridLayout(this, 2, 1); topLayout -> setSpacing(6); //setup name - QGridLayout * m_pNameLayout = new QGridLayout(topLayout, 3, 2); + TQGridLayout * m_pNameLayout = new TQGridLayout(topLayout, 3, 2); m_pNameLayout -> setSpacing(6); - m_pNameL = new QLabel(this); + m_pNameL = new TQLabel(this); m_pNameL -> setText(i18n("Class name:")); m_pNameLayout -> addWidget(m_pNameL, 0, 0); - m_pClassNameLE = new QLineEdit(this); + m_pClassNameLE = new TQLineEdit(this); m_pClassNameLE -> setText(o -> getName()); m_pNameLayout -> addWidget(m_pClassNameLE, 0, 1); - m_pInstanceL = new QLabel(this); + m_pInstanceL = new TQLabel(this); m_pInstanceL -> setText(i18n("Instance name:")); m_pNameLayout -> addWidget(m_pInstanceL, 1, 0); - m_pInstanceLE = new QLineEdit(this); + m_pInstanceLE = new TQLineEdit(this); m_pInstanceLE -> setText(o -> getInstanceName()); m_pNameLayout -> addWidget(m_pInstanceLE, 1, 1); UMLView *view = UMLApp::app()->getCurrentView(); - m_pDrawActorCB = new QCheckBox( i18n( "Draw as actor" ) , this ); + m_pDrawActorCB = new TQCheckBox( i18n( "Draw as actor" ) , this ); m_pDrawActorCB -> setChecked( o -> getDrawAsActor() ); m_pNameLayout -> addWidget( m_pDrawActorCB, 2, 0 ); if(view -> getType() == Uml::dt_Collaboration) { - m_pMultiCB = new QCheckBox(i18n("Multiple instance"), this); + m_pMultiCB = new TQCheckBox(i18n("Multiple instance"), this); m_pMultiCB -> setChecked(o -> getMultipleInstance()); m_pNameLayout -> addWidget(m_pMultiCB, 2,1); if( m_pDrawActorCB -> isChecked() ) m_pMultiCB -> setEnabled( false ); } else//sequence diagram { - m_pDeconCB = new QCheckBox(i18n("Show destruction"), this); + m_pDeconCB = new TQCheckBox(i18n("Show destruction"), this); m_pDeconCB->setChecked(o->getShowDestruction()); m_pNameLayout -> addWidget(m_pDeconCB, 2,1); } //setup documentation - m_pDocGB = new QGroupBox(this); + m_pDocGB = new TQGroupBox(this); topLayout -> addWidget(m_pDocGB, 1, 0); - QHBoxLayout * docLayout = new QHBoxLayout(m_pDocGB); + TQHBoxLayout * docLayout = new TQHBoxLayout(m_pDocGB); docLayout -> setMargin(margin); m_pDocGB -> setTitle(i18n("Documentation")); - m_pDoc = new QMultiLineEdit(m_pDocGB); - m_pDoc->setWordWrap(QMultiLineEdit::WidgetWidth); + m_pDoc = new TQMultiLineEdit(m_pDocGB); + m_pDoc->setWordWrap(TQMultiLineEdit::WidgetWidth); m_pDoc-> setText(o -> getDoc()); docLayout -> addWidget(m_pDoc); m_pObject = 0;//needs to be set to zero if( m_pMultiCB ) - connect( m_pDrawActorCB, SIGNAL( toggled( bool ) ), this, SLOT( slotActorToggled( bool ) ) ); + connect( m_pDrawActorCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotActorToggled( bool ) ) ); } -ClassGenPage::ClassGenPage(UMLDoc* d, QWidget* parent, UMLWidget* widget) : QWidget(parent) { +ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, UMLWidget* widget) : TQWidget(parent) { m_pWidget = 0; m_pObject = 0; m_pInstanceWidget = widget; @@ -311,13 +311,13 @@ ClassGenPage::ClassGenPage(UMLDoc* d, QWidget* parent, UMLWidget* widget) : QWid //int t = o -> getBaseType(); m_pUmldoc = d; setMinimumSize(310,330); - QGridLayout* topLayout = new QGridLayout(this, 2, 1); + TQGridLayout* topLayout = new TQGridLayout(this, 2, 1); topLayout->setSpacing(6); //setup name - QGridLayout* m_pNameLayout = new QGridLayout(topLayout, 3, 2); + TQGridLayout* m_pNameLayout = new TQGridLayout(topLayout, 3, 2); m_pNameLayout->setSpacing(6); - m_pNameL = new QLabel(this); + m_pNameL = new TQLabel(this); if (widget->getBaseType() == Uml::wt_Component) { m_pNameL->setText(i18n("Component name:")); } else if (widget->getBaseType() == Uml::wt_Node) { @@ -327,11 +327,11 @@ ClassGenPage::ClassGenPage(UMLDoc* d, QWidget* parent, UMLWidget* widget) : QWid } m_pNameLayout->addWidget(m_pNameL, 0, 0); - m_pClassNameLE = new QLineEdit(this); + m_pClassNameLE = new TQLineEdit(this); m_pClassNameLE->setText(widget->getName()); m_pNameLayout->addWidget(m_pClassNameLE, 0, 1); - m_pStereoTypeL = new QLabel(i18n("Stereotype name:"), this); + m_pStereoTypeL = new TQLabel(i18n("Stereotype name:"), this); m_pNameLayout->addWidget(m_pStereoTypeL, 1, 0); m_pStereoTypeCB = new KComboBox(true, this); @@ -340,23 +340,23 @@ ClassGenPage::ClassGenPage(UMLDoc* d, QWidget* parent, UMLWidget* widget) : QWid m_pStereoTypeCB->setCurrentText( widget->getUMLObject()->getStereotype() ); m_pStereoTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup ); - m_pInstanceL = new QLabel(this); + m_pInstanceL = new TQLabel(this); m_pInstanceL->setText(i18n("Instance name:")); m_pNameLayout->addWidget(m_pInstanceL, 2, 0); - m_pInstanceLE = new QLineEdit(this); + m_pInstanceLE = new TQLineEdit(this); m_pInstanceLE->setText(widget->getInstanceName()); m_pNameLayout->addWidget(m_pInstanceLE, 2, 1); //setup documentation - m_pDocGB = new QGroupBox(this); + m_pDocGB = new TQGroupBox(this); topLayout->addWidget(m_pDocGB, 1, 0); - QHBoxLayout* docLayout = new QHBoxLayout(m_pDocGB); + TQHBoxLayout* docLayout = new TQHBoxLayout(m_pDocGB); docLayout->setMargin(margin); m_pDocGB->setTitle(i18n("Documentation")); - m_pDoc = new QMultiLineEdit(m_pDocGB); - m_pDoc->setWordWrap(QMultiLineEdit::WidgetWidth); + m_pDoc = new TQMultiLineEdit(m_pDocGB); + m_pDoc->setWordWrap(TQMultiLineEdit::WidgetWidth); m_pDoc->setText(widget->getDoc()); docLayout->addWidget(m_pDoc); m_pObject = 0;//needs to be set to zero @@ -364,7 +364,7 @@ ClassGenPage::ClassGenPage(UMLDoc* d, QWidget* parent, UMLWidget* widget) : QWid ClassGenPage::~ClassGenPage() {} -void ClassGenPage::insertStereotype( const QString& type, int index ) +void ClassGenPage::insertStereotype( const TQString& type, int index ) { m_pStereoTypeCB->insertItem( type, index ); m_pStereoTypeCB->completionObject()->addItem( type ); @@ -372,7 +372,7 @@ void ClassGenPage::insertStereotype( const QString& type, int index ) void ClassGenPage::updateObject() { if(m_pObject) { - QString name = m_pClassNameLE -> text(); + TQString name = m_pClassNameLE -> text(); m_pObject -> setDoc(m_pDoc -> text()); @@ -437,7 +437,7 @@ void ClassGenPage::updateObject() { m_pWidget -> setDrawAsActor( m_pDrawActorCB -> isChecked() ); if( m_pDeconCB ) m_pWidget -> setShowDestruction( m_pDeconCB -> isChecked() ); - QString name = m_pClassNameLE -> text(); + TQString name = m_pClassNameLE -> text(); m_pWidget -> setDoc(m_pDoc -> text()); UMLObject * o = m_pWidget -> getUMLObject(); UMLObject * old = m_pUmldoc -> findUMLObject(name); @@ -448,7 +448,7 @@ void ClassGenPage::updateObject() { o -> setName(name); } else if (m_pInstanceWidget) { m_pInstanceWidget->setInstanceName(m_pInstanceLE->text()); - QString name = m_pClassNameLE->text(); + TQString name = m_pClassNameLE->text(); m_pInstanceWidget->setDoc(m_pDoc->text()); UMLObject* o = m_pInstanceWidget->getUMLObject(); UMLObject* old = m_pUmldoc->findUMLObject(name); diff --git a/umbrello/umbrello/dialogs/classgenpage.h b/umbrello/umbrello/dialogs/classgenpage.h index 6fd0f7d3..6fad1cde 100644 --- a/umbrello/umbrello/dialogs/classgenpage.h +++ b/umbrello/umbrello/dialogs/classgenpage.h @@ -12,7 +12,7 @@ #ifndef CLASSGENPAGE_H #define CLASSGENPAGE_H -#include <qwidget.h> +#include <tqwidget.h> class QGroupBox; class QLabel; @@ -36,7 +36,7 @@ class UMLDoc; * @author Paul Hensgen <phensgen@techie.com> * Bugs and comments to uml-devel@lists.sf.net or http://bugs.kde.org */ -class ClassGenPage : public QWidget { +class ClassGenPage : public TQWidget { Q_OBJECT public: @@ -47,7 +47,7 @@ public: * @param parent The parent to the ClassGenPage. * @param o The UMLObject to display the properties of. */ - ClassGenPage(UMLDoc *d, QWidget *parent, UMLObject * o); + ClassGenPage(UMLDoc *d, TQWidget *parent, UMLObject * o); /** * Sets up the ClassGenPage for an ObjectWidget @@ -56,7 +56,7 @@ public: * @param parent The parent to the ClassGenPage. * @param o The ObjectWidget to display the properties of. */ - ClassGenPage(UMLDoc *d, QWidget *parent, ObjectWidget * o); + ClassGenPage(UMLDoc *d, TQWidget *parent, ObjectWidget * o); /** * Sets up the ClassGenPage for a UMLWidget instance (used @@ -66,7 +66,7 @@ public: * @param parent The parent to the ClassGenPage. * @param widget The UMLWidget to display the properties of. */ - ClassGenPage(UMLDoc* d, QWidget* parent, UMLWidget* widget); + ClassGenPage(UMLDoc* d, TQWidget* parent, UMLWidget* widget); /** * Standard deconstructor. @@ -79,23 +79,23 @@ public: */ void updateObject(); private: - QGroupBox *m_pDocGB; - QButtonGroup * m_pButtonBG; - QLabel * m_pNameL, * m_pInstanceL, * m_pStereoTypeL, * m_pPackageL; - QLineEdit * m_pClassNameLE, *m_pInstanceLE, * m_pPackageLE; + TQGroupBox *m_pDocGB; + TQButtonGroup * m_pButtonBG; + TQLabel * m_pNameL, * m_pInstanceL, * m_pStereoTypeL, * m_pPackageL; + TQLineEdit * m_pClassNameLE, *m_pInstanceLE, * m_pPackageLE; KComboBox * m_pStereoTypeCB; - QRadioButton *m_pPublicRB, *m_pPrivateRB, *m_pProtectedRB, *m_pImplementationRB; - QCheckBox * m_pMultiCB, * m_pDrawActorCB, * m_pAbstractCB, * m_pDeconCB; - QMultiLineEdit * m_pDoc; + TQRadioButton *m_pPublicRB, *m_pPrivateRB, *m_pProtectedRB, *m_pImplementationRB; + TQCheckBox * m_pMultiCB, * m_pDrawActorCB, * m_pAbstractCB, * m_pDeconCB; + TQMultiLineEdit * m_pDoc; UMLObject * m_pObject; UMLDoc * m_pUmldoc; ObjectWidget * m_pWidget; UMLWidget* m_pInstanceWidget; - QButtonGroup* m_pDrawAsBG; - QRadioButton* m_pDefaultRB,* m_pFileRB,* m_pLibraryRB,* m_pTableRB; - QCheckBox* m_pExecutableCB; + TQButtonGroup* m_pDrawAsBG; + TQRadioButton* m_pDefaultRB,* m_pFileRB,* m_pLibraryRB,* m_pTableRB; + TQCheckBox* m_pExecutableCB; - void insertStereotype(const QString& type, int index = -1); + void insertStereotype(const TQString& type, int index = -1); public slots: /** diff --git a/umbrello/umbrello/dialogs/classifierlistpage.cpp b/umbrello/umbrello/dialogs/classifierlistpage.cpp index d7148660..e59956bc 100644 --- a/umbrello/umbrello/dialogs/classifierlistpage.cpp +++ b/umbrello/umbrello/dialogs/classifierlistpage.cpp @@ -25,15 +25,15 @@ #include <kbuttonbox.h> #include <kdebug.h> #include <klocale.h> -#include <qlayout.h> +#include <tqlayout.h> using namespace Uml; -ClassifierListPage::ClassifierListPage(QWidget* parent, UMLClassifier* classifier, - UMLDoc* doc, Uml::Object_Type type) : QWidget(parent) { +ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifier, + UMLDoc* doc, Uml::Object_Type type) : TQWidget(parent) { m_itemType = type; - QString typeName(""); - QString newItemType(""); + TQString typeName(""); + TQString newItemType(""); if (type == ot_Attribute) { typeName = i18n("Attributes"); newItemType = i18n("N&ew Attribute..."); @@ -61,22 +61,22 @@ ClassifierListPage::ClassifierListPage(QWidget* parent, UMLClassifier* classifie setMinimumSize(310,330); //main layout contains our two group boxes, the list and the documentation - QVBoxLayout* mainLayout = new QVBoxLayout( this ); + TQVBoxLayout* mainLayout = new TQVBoxLayout( this ); mainLayout->setSpacing(10); //top group box, contains a vertical layout with list box above and buttons below - m_pItemListGB = new QGroupBox(typeName, this ); - QVBoxLayout* listVBoxLayout = new QVBoxLayout( m_pItemListGB ); + m_pItemListGB = new TQGroupBox(typeName, this ); + TQVBoxLayout* listVBoxLayout = new TQVBoxLayout( m_pItemListGB ); listVBoxLayout->setMargin(margin); listVBoxLayout->setSpacing ( 10 ); //horizontal box contains the list box and the move up/down buttons - QHBoxLayout* listHBoxLayout = new QHBoxLayout( listVBoxLayout ); - m_pItemListLB = new QListBox(m_pItemListGB); + TQHBoxLayout* listHBoxLayout = new TQHBoxLayout( listVBoxLayout ); + m_pItemListLB = new TQListBox(m_pItemListGB); listHBoxLayout->addWidget(m_pItemListLB); //the move up/down buttons (another vertical box) - QVBoxLayout* buttonLayout = new QVBoxLayout( listHBoxLayout ); + TQVBoxLayout* buttonLayout = new TQVBoxLayout( listHBoxLayout ); m_pTopArrowB = new KArrowButton( m_pItemListGB ); m_pTopArrowB->setEnabled( false ); buttonLayout->addWidget( m_pTopArrowB ); @@ -95,17 +95,17 @@ ClassifierListPage::ClassifierListPage(QWidget* parent, UMLClassifier* classifie //the action buttons KButtonBox* buttonBox = new KButtonBox(m_pItemListGB); - buttonBox->addButton( newItemType, this, SLOT(slotNewListItem()) ); + buttonBox->addButton( newItemType, this, TQT_SLOT(slotNewListItem()) ); m_pDeleteListItemButton = buttonBox->addButton( i18n("&Delete"), - this, SLOT(slotDelete()) ); - m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), this, SLOT(slotProperties()) ); + this, TQT_SLOT(slotDelete()) ); + m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), this, TQT_SLOT(slotProperties()) ); listVBoxLayout->addWidget(buttonBox); mainLayout->addWidget(m_pItemListGB); - m_pDocGB = new QGroupBox(i18n("Documentation"), this); - QVBoxLayout* docLayout = new QVBoxLayout( m_pDocGB ); - m_pDocTE = new QTextEdit( m_pDocGB ); + m_pDocGB = new TQGroupBox(i18n("Documentation"), this); + TQVBoxLayout* docLayout = new TQVBoxLayout( m_pDocGB ); + m_pDocTE = new TQTextEdit( m_pDocGB ); docLayout->setMargin(margin); docLayout->setSpacing ( 10 ); docLayout->addWidget( m_pDocTE ); @@ -117,27 +117,27 @@ ClassifierListPage::ClassifierListPage(QWidget* parent, UMLClassifier* classifie // to the ListItemModified slot in this class for (UMLClassifierListItem* listItem = itemList.first(); listItem != 0; listItem = itemList.next() ) { m_pItemListLB->insertItem(listItem->toString(Uml::st_SigNoVis)); - connect( listItem, SIGNAL(modified()),this,SLOT(slotListItemModified()) ); + connect( listItem, TQT_SIGNAL(modified()),this,TQT_SLOT(slotListItemModified()) ); } enableWidgets(false);//disable widgets until an att is chosen m_pOldListItem = 0; - connect(m_pItemListLB, SIGNAL(clicked(QListBoxItem*)), this, SLOT(slotClicked(QListBoxItem*))); - connect(m_pItemListLB, SIGNAL(selectionChanged(QListBoxItem*)), this, SLOT(slotClicked(QListBoxItem*))); - - connect(m_pItemListLB, SIGNAL(rightButtonPressed(QListBoxItem*, const QPoint&)), - this, SLOT(slotRightButtonPressed(QListBoxItem*, const QPoint&))); - - connect(m_pItemListLB, SIGNAL(rightButtonClicked(QListBoxItem*, const QPoint&)), - this, SLOT(slotRightButtonClicked(QListBoxItem*, const QPoint&))); - connect(m_pDoc, SIGNAL(sigObjectCreated(UMLObject*)), this, SLOT(slotListItemCreated(UMLObject*))); - - connect( m_pTopArrowB, SIGNAL( clicked() ), this, SLOT( slotTopClicked() ) ); - connect( m_pUpArrowB, SIGNAL( clicked() ), this, SLOT( slotUpClicked() ) ); - connect( m_pDownArrowB, SIGNAL( clicked() ), this, SLOT( slotDownClicked() ) ); - connect( m_pBottomArrowB, SIGNAL( clicked() ), this, SLOT( slotBottomClicked() ) ); - connect( m_pItemListLB, SIGNAL( doubleClicked( QListBoxItem* ) ), - this, SLOT( slotDoubleClick( QListBoxItem* ) ) ); + connect(m_pItemListLB, TQT_SIGNAL(clicked(TQListBoxItem*)), this, TQT_SLOT(slotClicked(TQListBoxItem*))); + connect(m_pItemListLB, TQT_SIGNAL(selectionChanged(TQListBoxItem*)), this, TQT_SLOT(slotClicked(TQListBoxItem*))); + + connect(m_pItemListLB, TQT_SIGNAL(rightButtonPressed(TQListBoxItem*, const TQPoint&)), + this, TQT_SLOT(slotRightButtonPressed(TQListBoxItem*, const TQPoint&))); + + connect(m_pItemListLB, TQT_SIGNAL(rightButtonClicked(TQListBoxItem*, const TQPoint&)), + this, TQT_SLOT(slotRightButtonClicked(TQListBoxItem*, const TQPoint&))); + connect(m_pDoc, TQT_SIGNAL(sigObjectCreated(UMLObject*)), this, TQT_SLOT(slotListItemCreated(UMLObject*))); + + connect( m_pTopArrowB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTopClicked() ) ); + connect( m_pUpArrowB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) ); + connect( m_pDownArrowB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) ); + connect( m_pBottomArrowB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBottomClicked() ) ); + connect( m_pItemListLB, TQT_SIGNAL( doubleClicked( TQListBoxItem* ) ), + this, TQT_SLOT( slotDoubleClick( TQListBoxItem* ) ) ); } ClassifierListPage::~ClassifierListPage() { @@ -189,7 +189,7 @@ void ClassifierListPage::enableWidgets(bool state) { m_pPropertiesButton->setEnabled(true); } -void ClassifierListPage::slotClicked(QListBoxItem*item) { +void ClassifierListPage::slotClicked(TQListBoxItem*item) { //if not first time an item is highlighted //save old highlighted item first if(m_pOldListItem) { @@ -201,7 +201,7 @@ void ClassifierListPage::slotClicked(QListBoxItem*item) { // focus and so at least one item is always selected; this doesn't happen, if // there are no items of course; // - // for more information see Qt doc for void QListBox::clearSelection() + // for more information see Qt doc for void TQListBox::clearSelection() UMLClassifierListItem* listItem; if (item == NULL) { if (m_pItemListLB->count() == 0) { @@ -226,11 +226,11 @@ void ClassifierListPage::slotClicked(QListBoxItem*item) { void ClassifierListPage::updateObject() { saveCurrentItemDocumentation(); - QListBoxItem*i = m_pItemListLB->item(m_pItemListLB->currentItem()); + TQListBoxItem*i = m_pItemListLB->item(m_pItemListLB->currentItem()); slotClicked(i); // The rest of this function does nothing?! - QStringList stringList; + TQStringList stringList; int count = m_pItemListLB->count(); for( int j = 0; j < count ; j++ ) stringList.append( m_pItemListLB->text( j ) ); @@ -267,16 +267,16 @@ void ClassifierListPage::slotListItemModified() { m_bSigWaiting = false; } -void ClassifierListPage::slotRightButtonClicked(QListBoxItem* /*item*/, const QPoint& /* p*/) { +void ClassifierListPage::slotRightButtonClicked(TQListBoxItem* /*item*/, const TQPoint& /* p*/) { if (m_pMenu) { m_pMenu->hide(); - disconnect(m_pMenu, SIGNAL(activated(int)), this, SLOT(slotPopupMenuSel(int))); + disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } } -void ClassifierListPage::slotRightButtonPressed(QListBoxItem* item, const QPoint& p) { +void ClassifierListPage::slotRightButtonPressed(TQListBoxItem* item, const TQPoint& p) { ListPopupMenu::Menu_Type type = ListPopupMenu::mt_Undefined; if (item) { //pressed on a list item if (m_itemType == ot_Attribute) { @@ -309,14 +309,14 @@ void ClassifierListPage::slotRightButtonPressed(QListBoxItem* item, const QPoint } if(m_pMenu) { m_pMenu->hide(); - disconnect(m_pMenu, SIGNAL(activated(int)), this, SLOT(slotPopupMenuSel(int))); + disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } m_pMenu = new ListPopupMenu(this, type); m_pMenu->popup(p); - connect(m_pMenu, SIGNAL(activated(int)), this, SLOT(slotPopupMenuSel(int))); + connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); } void ClassifierListPage::slotPopupMenuSel(int id) { @@ -349,10 +349,10 @@ void ClassifierListPage::slotPopupMenuSel(int id) { } } -void ClassifierListPage::printItemList(QString prologue) { +void ClassifierListPage::printItemList(TQString prologue) { #ifdef VERBOSE_DEBUGGING UMLClassifierListItem* item; - QString buf; + TQString buf; UMLClassifierListItemList itemList = getItemList(); for (UMLClassifierListItemListIt it(itemList); (item = it.current()) != NULL; ++it) buf.append(' ' + item->getName()); @@ -369,11 +369,11 @@ void ClassifierListPage::slotTopClicked() { m_pOldListItem = NULL; //swap the text around in the ListBox - QString currentString = m_pItemListLB->text( index ); + TQString currentString = m_pItemListLB->text( index ); m_pItemListLB->removeItem( index ); m_pItemListLB->insertItem( currentString, 0 ); //set the moved item selected - QListBoxItem* item = m_pItemListLB->item( 0 ); + TQListBoxItem* item = m_pItemListLB->item( 0 ); m_pItemListLB->setSelected( item, true ); //now change around in the list @@ -400,12 +400,12 @@ void ClassifierListPage::slotUpClicked() { m_pOldListItem = NULL; //swap the text around in the ListBox - QString aboveString = m_pItemListLB->text( index - 1 ); - QString currentString = m_pItemListLB->text( index ); + TQString aboveString = m_pItemListLB->text( index - 1 ); + TQString currentString = m_pItemListLB->text( index ); m_pItemListLB->changeItem( currentString, index -1 ); m_pItemListLB->changeItem( aboveString, index ); //set the moved item selected - QListBoxItem* item = m_pItemListLB->item( index - 1 ); + TQListBoxItem* item = m_pItemListLB->item( index - 1 ); m_pItemListLB->setSelected( item, true ); //now change around in the list @@ -434,12 +434,12 @@ void ClassifierListPage::slotDownClicked() { m_pOldListItem = NULL; //swap the text around in the ListBox - QString belowString = m_pItemListLB->text( index + 1 ); - QString currentString = m_pItemListLB->text( index ); + TQString belowString = m_pItemListLB->text( index + 1 ); + TQString currentString = m_pItemListLB->text( index ); m_pItemListLB->changeItem( currentString, index + 1 ); m_pItemListLB->changeItem( belowString, index ); //set the moved item selected - QListBoxItem* item = m_pItemListLB->item( index + 1 ); + TQListBoxItem* item = m_pItemListLB->item( index + 1 ); m_pItemListLB->setSelected( item, true ); //now change around in the list printItemList("itemList before change: "); @@ -467,11 +467,11 @@ void ClassifierListPage::slotBottomClicked() { m_pOldListItem = NULL; //swap the text around in the ListBox - QString currentString = m_pItemListLB->text( index ); + TQString currentString = m_pItemListLB->text( index ); m_pItemListLB->removeItem( index ); m_pItemListLB->insertItem( currentString, m_pItemListLB->count() ); //set the moved item selected - QListBoxItem* item = m_pItemListLB->item( m_pItemListLB->count() - 1 ); + TQListBoxItem* item = m_pItemListLB->item( m_pItemListLB->count() - 1 ); m_pItemListLB->setSelected( item, true ); //now change around in the list @@ -489,7 +489,7 @@ void ClassifierListPage::slotBottomClicked() { slotClicked( item ); } -void ClassifierListPage::slotDoubleClick( QListBoxItem* item ) { +void ClassifierListPage::slotDoubleClick( TQListBoxItem* item ) { if( !item ) return; diff --git a/umbrello/umbrello/dialogs/classifierlistpage.h b/umbrello/umbrello/dialogs/classifierlistpage.h index ea1c0b9f..1dba8297 100644 --- a/umbrello/umbrello/dialogs/classifierlistpage.h +++ b/umbrello/umbrello/dialogs/classifierlistpage.h @@ -13,10 +13,10 @@ #define CLASSIFIERLISTPAGE_H //qt includes -#include <qwidget.h> -#include <qgroupbox.h> -#include <qlistbox.h> -#include <qtextedit.h> +#include <tqwidget.h> +#include <tqgroupbox.h> +#include <tqlistbox.h> +#include <tqtextedit.h> //kde includes #include <karrowbutton.h> @@ -36,7 +36,7 @@ class UMLDoc; * @author Paul Hensgen, Jonathan Riddell * Bugs and comments to uml-devel@lists.sf.net or http://bugs.kde.org */ -class ClassifierListPage : public QWidget { +class ClassifierListPage : public TQWidget { Q_OBJECT public: /** @@ -47,7 +47,7 @@ public: * @param doc The UMLDoc document * @param type The type of listItem this handles */ - ClassifierListPage(QWidget* parent, UMLClassifier* classifier, UMLDoc* doc, Uml::Object_Type type); + ClassifierListPage(TQWidget* parent, UMLClassifier* classifier, UMLDoc* doc, Uml::Object_Type type); /** * Standard deconstructor. @@ -108,21 +108,21 @@ private: * Utility for debugging, prints the current item list. * Only effective if VERBOSE_DEBUGGING is defined. */ - void printItemList(QString prologue); + void printItemList(TQString prologue); UMLClassifier* m_pClassifier; - QGroupBox* m_pDocGB; - QGroupBox* m_pItemListGB; - QListBox* m_pItemListLB; - QTextEdit* m_pDocTE; + TQGroupBox* m_pDocGB; + TQGroupBox* m_pItemListGB; + TQListBox* m_pItemListLB; + TQTextEdit* m_pDocTE; Uml::Object_Type m_itemType; KArrowButton* m_pTopArrowB; KArrowButton* m_pUpArrowB; KArrowButton* m_pDownArrowB; KArrowButton* m_pBottomArrowB; - QPushButton* m_pDeleteListItemButton; - QPushButton* m_pPropertiesButton; + TQPushButton* m_pDeleteListItemButton; + TQPushButton* m_pPropertiesButton; UMLClassifierListItem* m_pOldListItem; UMLDoc* m_pDoc; @@ -134,7 +134,7 @@ public slots: * called when list view is clicked on * calls enableWidgets() */ - void slotClicked(QListBoxItem* item); + void slotClicked(TQListBoxItem* item); /** * Called when an item is selected in a right click menu @@ -143,13 +143,13 @@ public slots: void slotListItemCreated(UMLObject* object); void slotListItemModified(); - void slotRightButtonClicked(QListBoxItem* item, const QPoint& p); - void slotRightButtonPressed(QListBoxItem* item, const QPoint& p); + void slotRightButtonClicked(TQListBoxItem* item, const TQPoint& p); + void slotRightButtonPressed(TQListBoxItem* item, const TQPoint& p); /** * shows properties dialog for the attribute clicked on */ - void slotDoubleClick(QListBoxItem* item); + void slotDoubleClick(TQListBoxItem* item); /** diff --git a/umbrello/umbrello/dialogs/classoptionspage.cpp b/umbrello/umbrello/dialogs/classoptionspage.cpp index 7a54f2dc..670d86f1 100644 --- a/umbrello/umbrello/dialogs/classoptionspage.cpp +++ b/umbrello/umbrello/dialogs/classoptionspage.cpp @@ -13,7 +13,7 @@ #include "classoptionspage.h" // qt/kde includes -#include <qlayout.h> +#include <tqlayout.h> #include <klocale.h> #include <kdebug.h> @@ -22,15 +22,15 @@ #include "../classifierwidget.h" -ClassOptionsPage::ClassOptionsPage(QWidget* pParent, ClassifierWidget* pWidget) - : QWidget( pParent ) { +ClassOptionsPage::ClassOptionsPage(TQWidget* pParent, ClassifierWidget* pWidget) + : TQWidget( pParent ) { init(); //Uml::Widget_Type type = pWidget->getBaseType(); m_pWidget = pWidget; setupPage(); } -ClassOptionsPage::ClassOptionsPage(QWidget* pParent, Settings::OptionState *options) : QWidget( pParent ) +ClassOptionsPage::ClassOptionsPage(TQWidget* pParent, Settings::OptionState *options) : TQWidget( pParent ) { init(); m_options = options; @@ -54,20 +54,20 @@ void ClassOptionsPage::setupPage() { bool sig = false; Uml::Signature_Type sigtype; - QVBoxLayout * topLayout = new QVBoxLayout(this); + TQVBoxLayout * topLayout = new TQVBoxLayout(this); topLayout -> setSpacing(6); - m_pVisibilityGB = new QGroupBox(i18n("Show"), this); + m_pVisibilityGB = new TQGroupBox(i18n("Show"), this); topLayout -> addWidget(m_pVisibilityGB); - QGridLayout * visibilityLayout = new QGridLayout(m_pVisibilityGB); + TQGridLayout * visibilityLayout = new TQGridLayout(m_pVisibilityGB); visibilityLayout -> setSpacing(10); visibilityLayout -> setMargin(margin); visibilityLayout -> setRowStretch(3, 1); - m_pShowOpsCB = new QCheckBox(i18n("Operatio&ns"), m_pVisibilityGB); + m_pShowOpsCB = new TQCheckBox(i18n("Operatio&ns"), m_pVisibilityGB); m_pShowOpsCB -> setChecked(m_pWidget -> getShowOps()); visibilityLayout -> addWidget(m_pShowOpsCB, 0, 0); - m_pShowVisibilityCB = new QCheckBox(i18n("&Visibility"), m_pVisibilityGB); + m_pShowVisibilityCB = new TQCheckBox(i18n("&Visibility"), m_pVisibilityGB); m_pShowVisibilityCB -> setChecked(m_pWidget -> getShowVisibility()); visibilityLayout -> addWidget(m_pShowVisibilityCB, 0, 1); @@ -76,26 +76,26 @@ void ClassOptionsPage::setupPage() { sig = false; else sig = true; - m_pShowOpSigCB = new QCheckBox(i18n("O&peration signature"), m_pVisibilityGB); + m_pShowOpSigCB = new TQCheckBox(i18n("O&peration signature"), m_pVisibilityGB); m_pShowOpSigCB -> setChecked(sig); visibilityLayout -> addWidget(m_pShowOpSigCB, 1, 0); - m_pShowPackageCB = new QCheckBox(i18n("Pac&kage"), m_pVisibilityGB); + m_pShowPackageCB = new TQCheckBox(i18n("Pac&kage"), m_pVisibilityGB); m_pShowPackageCB -> setChecked(m_pWidget -> getShowPackage()); visibilityLayout -> addWidget(m_pShowPackageCB, 1, 1); Uml::Widget_Type type = m_pWidget->getBaseType(); if (type == Uml::wt_Class) { - m_pShowAttsCB = new QCheckBox(i18n("Att&ributes"), m_pVisibilityGB); + m_pShowAttsCB = new TQCheckBox(i18n("Att&ributes"), m_pVisibilityGB); m_pShowAttsCB->setChecked(m_pWidget->getShowAtts()); visibilityLayout->addWidget(m_pShowAttsCB, 2, 0); - m_pShowStereotypeCB = new QCheckBox(i18n("Stereot&ype"), m_pVisibilityGB); + m_pShowStereotypeCB = new TQCheckBox(i18n("Stereot&ype"), m_pVisibilityGB); m_pShowStereotypeCB->setChecked(m_pWidget->getShowStereotype()); visibilityLayout->addWidget(m_pShowStereotypeCB, 2, 1); - m_pShowAttSigCB = new QCheckBox(i18n("Attr&ibute signature"), m_pVisibilityGB); + m_pShowAttSigCB = new TQCheckBox(i18n("Attr&ibute signature"), m_pVisibilityGB); sigtype = m_pWidget->getShowAttSigs(); if(sigtype == Uml::st_NoSig || sigtype == Uml::st_NoSigNoVis) sig = false; @@ -105,7 +105,7 @@ void ClassOptionsPage::setupPage() { visibilityLayout->addWidget(m_pShowAttSigCB, 3, 0); } else if (type == Uml::wt_Interface) { - m_pDrawAsCircleCB = new QCheckBox(i18n("Draw as circle"), m_pVisibilityGB); + m_pDrawAsCircleCB = new TQCheckBox(i18n("Draw as circle"), m_pVisibilityGB); m_pDrawAsCircleCB->setChecked( m_pWidget->getDrawAsCircle() ); visibilityLayout->addWidget(m_pDrawAsCircleCB, 2, 0); } @@ -115,40 +115,40 @@ void ClassOptionsPage::setupClassPageOption() { int margin = fontMetrics().height(); - QVBoxLayout * topLayout = new QVBoxLayout(this); + TQVBoxLayout * topLayout = new TQVBoxLayout(this); topLayout -> setSpacing(6); - m_pVisibilityGB = new QGroupBox(i18n("Show"), this); + m_pVisibilityGB = new TQGroupBox(i18n("Show"), this); topLayout -> addWidget(m_pVisibilityGB); - QGridLayout * visibilityLayout = new QGridLayout(m_pVisibilityGB); + TQGridLayout * visibilityLayout = new TQGridLayout(m_pVisibilityGB); visibilityLayout -> setSpacing(10); visibilityLayout -> setMargin(margin); - m_pShowOpsCB = new QCheckBox(i18n("Operatio&ns"), m_pVisibilityGB); + m_pShowOpsCB = new TQCheckBox(i18n("Operatio&ns"), m_pVisibilityGB); m_pShowOpsCB -> setChecked( m_options->classState.showOps ); visibilityLayout -> addWidget(m_pShowOpsCB, 0, 0); - m_pShowOpSigCB = new QCheckBox(i18n("O&peration signature"), m_pVisibilityGB); + m_pShowOpSigCB = new TQCheckBox(i18n("O&peration signature"), m_pVisibilityGB); m_pShowOpSigCB -> setChecked(m_options->classState.showOpSig); visibilityLayout -> addWidget(m_pShowOpSigCB, 1, 0); visibilityLayout -> setRowStretch(3, 1); - m_pShowAttsCB = new QCheckBox(i18n("Att&ributes"), m_pVisibilityGB); + m_pShowAttsCB = new TQCheckBox(i18n("Att&ributes"), m_pVisibilityGB); m_pShowAttsCB -> setChecked(m_options->classState.showAtts ); visibilityLayout -> addWidget(m_pShowAttsCB, 2, 0); - m_pShowAttSigCB = new QCheckBox(i18n("Attr&ibute signature"), m_pVisibilityGB); + m_pShowAttSigCB = new TQCheckBox(i18n("Attr&ibute signature"), m_pVisibilityGB); m_pShowAttSigCB -> setChecked(m_options->classState.showAttSig); visibilityLayout -> addWidget(m_pShowAttSigCB, 3, 0); - m_pShowVisibilityCB = new QCheckBox(i18n("&Visibility"), m_pVisibilityGB); + m_pShowVisibilityCB = new TQCheckBox(i18n("&Visibility"), m_pVisibilityGB); m_pShowVisibilityCB -> setChecked(m_options->classState.showVisibility); visibilityLayout -> addWidget(m_pShowVisibilityCB, 0, 1); - m_pShowPackageCB = new QCheckBox(i18n("Pac&kage"), m_pVisibilityGB); + m_pShowPackageCB = new TQCheckBox(i18n("Pac&kage"), m_pVisibilityGB); m_pShowPackageCB -> setChecked(m_options->classState.showPackage); visibilityLayout -> addWidget(m_pShowPackageCB, 1, 1); - m_pShowStereotypeCB = new QCheckBox(i18n("Stereot&ype"), m_pVisibilityGB); + m_pShowStereotypeCB = new TQCheckBox(i18n("Stereot&ype"), m_pVisibilityGB); m_pShowStereotypeCB -> setChecked(m_options->classState.showStereoType); visibilityLayout -> addWidget(m_pShowStereotypeCB, 2, 1); diff --git a/umbrello/umbrello/dialogs/classoptionspage.h b/umbrello/umbrello/dialogs/classoptionspage.h index 50d43f8c..718944cc 100644 --- a/umbrello/umbrello/dialogs/classoptionspage.h +++ b/umbrello/umbrello/dialogs/classoptionspage.h @@ -13,9 +13,9 @@ #ifndef CLASSOPTIONSPAGE_H #define CLASSOPTIONSPAGE_H -#include <qwidget.h> -#include <qgroupbox.h> -#include <qcheckbox.h> +#include <tqwidget.h> +#include <tqgroupbox.h> +#include <tqcheckbox.h> #include "../optionstate.h" @@ -31,17 +31,17 @@ class ClassifierWidget; * @see ClassPropDlg * Bugs and comments to uml-devel@lists.sf.net or http://bugs.kde.org */ -class ClassOptionsPage : public QWidget { +class ClassOptionsPage : public TQWidget { public: /** * Constructor - observe and modify a Widget */ - ClassOptionsPage(QWidget* pParent, ClassifierWidget* pWidget); + ClassOptionsPage(TQWidget* pParent, ClassifierWidget* pWidget); /** * Constructor - observe and modify an OptionState structure */ - ClassOptionsPage(QWidget* pParent, Settings::OptionState *options ); + ClassOptionsPage(TQWidget* pParent, Settings::OptionState *options ); /** * destructor @@ -88,11 +88,11 @@ protected: void updateOptionState(); //GUI widgets - QGroupBox * m_pVisibilityGB; - QCheckBox * m_pShowVisibilityCB, * m_pShowAttSigCB; - QCheckBox * m_pShowOpSigCB, * m_pShowAttsCB, * m_pShowOpsCB; - QCheckBox * m_pShowStereotypeCB, * m_pShowPackageCB; - QCheckBox* m_pDrawAsCircleCB; + TQGroupBox * m_pVisibilityGB; + TQCheckBox * m_pShowVisibilityCB, * m_pShowAttSigCB; + TQCheckBox * m_pShowOpSigCB, * m_pShowAttsCB, * m_pShowOpsCB; + TQCheckBox * m_pShowStereotypeCB, * m_pShowPackageCB; + TQCheckBox* m_pDrawAsCircleCB; /** * The classifier widget to represent in the dialog page. diff --git a/umbrello/umbrello/dialogs/classpropdlg.cpp b/umbrello/umbrello/dialogs/classpropdlg.cpp index 9c4848a1..169de20e 100644 --- a/umbrello/umbrello/dialogs/classpropdlg.cpp +++ b/umbrello/umbrello/dialogs/classpropdlg.cpp @@ -13,7 +13,7 @@ #include "classpropdlg.h" // qt/kde includes -#include <qlayout.h> +#include <tqlayout.h> #include <kiconloader.h> #include <klocale.h> #include <kdebug.h> @@ -33,7 +33,7 @@ #include "../uml.h" #include "../umlview.h" -ClassPropDlg::ClassPropDlg(QWidget *parent, UMLObject * c, int pageNum, bool assoc) +ClassPropDlg::ClassPropDlg(TQWidget *parent, UMLObject * c, int pageNum, bool assoc) : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help, Ok, parent, "_CLASSDLG_", true, true) { m_pWidget = 0; @@ -52,7 +52,7 @@ ClassPropDlg::ClassPropDlg(QWidget *parent, UMLObject * c, int pageNum, bool ass showPage(pageNum); } -ClassPropDlg::ClassPropDlg(QWidget *parent, ObjectWidget * o) +ClassPropDlg::ClassPropDlg(TQWidget *parent, ObjectWidget * o) : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help, Ok, parent, "_CLASSDLG_", true, true) { m_pWidget = o; @@ -66,14 +66,14 @@ ClassPropDlg::ClassPropDlg(QWidget *parent, ObjectWidget * o) m_Type = pt_ObjectWidget; m_pObject = m_pWidget->getUMLObject(); m_pDoc = UMLApp::app()->getDocument(); - QFrame *page = addPage( i18n("General"), i18n("General Settings"), DesktopIcon( "misc") ); + TQFrame *page = addPage( i18n("General"), i18n("General Settings"), DesktopIcon( "misc") ); page -> setMinimumSize(310, 330); - QHBoxLayout * topLayout = new QHBoxLayout(page); + TQHBoxLayout * topLayout = new TQHBoxLayout(page); m_pGenPage = new ClassGenPage(m_pDoc, page, o); topLayout -> addWidget(m_pGenPage); - QFrame * newPage = addPage( i18n("Color"), i18n("Widget Colors"), DesktopIcon( "colors") ); - QHBoxLayout * m_pColorLayout = new QHBoxLayout(newPage); + TQFrame * newPage = addPage( i18n("Color"), i18n("Widget Colors"), DesktopIcon( "colors") ); + TQHBoxLayout * m_pColorLayout = new TQHBoxLayout(newPage); m_pColorPage = new UMLWidgetColorPage(newPage, o); m_pColorLayout -> addWidget(m_pColorPage); @@ -82,7 +82,7 @@ ClassPropDlg::ClassPropDlg(QWidget *parent, ObjectWidget * o) setMinimumSize(340,420); } -ClassPropDlg::ClassPropDlg(QWidget *parent, UMLWidget * w) +ClassPropDlg::ClassPropDlg(TQWidget *parent, UMLWidget * w) : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help, Ok, parent, "_CLASSDLG_", true, true) { m_pWidget = w; @@ -115,15 +115,15 @@ ClassPropDlg::ClassPropDlg(QWidget *parent, UMLWidget * w) //now setup the options page for classes if (w->getBaseType() == Uml::wt_Class || w->getBaseType() == Uml::wt_Interface) { - QFrame* newPage = addPage( i18n("Display"), i18n("Display Options"), DesktopIcon("info") ); - QHBoxLayout* m_pOptionsLayout = new QHBoxLayout(newPage); + TQFrame* newPage = addPage( i18n("Display"), i18n("Display Options"), DesktopIcon("info") ); + TQHBoxLayout* m_pOptionsLayout = new TQHBoxLayout(newPage); ClassifierWidget *cw = static_cast<ClassifierWidget*>(w); m_pOptionsPage = new ClassOptionsPage( newPage, cw ); m_pOptionsLayout -> addWidget(m_pOptionsPage); } - QFrame* colorPage = addPage( i18n("Color"), i18n("Widget Colors"), DesktopIcon("colors") ); - QHBoxLayout * m_pColorLayout = new QHBoxLayout(colorPage); + TQFrame* colorPage = addPage( i18n("Color"), i18n("Widget Colors"), DesktopIcon("colors") ); + TQHBoxLayout * m_pColorLayout = new TQHBoxLayout(colorPage); m_pColorPage = new UMLWidgetColorPage(colorPage, w); m_pColorLayout -> addWidget(m_pColorPage); setupFontPage(); @@ -167,8 +167,8 @@ void ClassPropDlg::slotApply() { } void ClassPropDlg::setupPages(UMLObject * c, bool assoc) { - QFrame *page = addPage(i18n("General"), i18n("General Settings"), DesktopIcon( "misc") ); - QHBoxLayout * genLayout = new QHBoxLayout(page); + TQFrame *page = addPage(i18n("General"), i18n("General Settings"), DesktopIcon( "misc") ); + TQHBoxLayout * genLayout = new TQHBoxLayout(page); page -> setMinimumSize(310, 330); m_pGenPage = new ClassGenPage(m_pDoc, page, c); genLayout -> addWidget(m_pGenPage); @@ -176,52 +176,52 @@ void ClassPropDlg::setupPages(UMLObject * c, bool assoc) { //add extra pages for class if (ot == Uml::ot_Class ) { //setup attributes page - QFrame* newPage = addPage( i18n("Attributes"), i18n("Attribute Settings"), DesktopIcon("misc") ); + TQFrame* newPage = addPage( i18n("Attributes"), i18n("Attribute Settings"), DesktopIcon("misc") ); m_pAttPage = new ClassifierListPage(newPage, (UMLClassifier *)c, m_pDoc, Uml::ot_Attribute); - QHBoxLayout * attLayout = new QHBoxLayout(newPage); + TQHBoxLayout * attLayout = new TQHBoxLayout(newPage); attLayout -> addWidget(m_pAttPage); } if (ot == Uml::ot_Class || ot == Uml::ot_Interface) { //setup operations page - QFrame* newPage = addPage( i18n("Operations"), i18n("Operation Settings"), DesktopIcon("misc") ); + TQFrame* newPage = addPage( i18n("Operations"), i18n("Operation Settings"), DesktopIcon("misc") ); m_pOpsPage = new ClassifierListPage(newPage, (UMLClassifier*)c, m_pDoc, Uml::ot_Operation); - QHBoxLayout* pOpsLayout = new QHBoxLayout(newPage); + TQHBoxLayout* pOpsLayout = new TQHBoxLayout(newPage); pOpsLayout -> addWidget(m_pOpsPage); } if (ot == Uml::ot_Class || ot == Uml::ot_Interface) { //setup templates page - QFrame* newPage = addPage( i18n("Templates"), i18n("Templates Settings"), DesktopIcon("misc") ); + TQFrame* newPage = addPage( i18n("Templates"), i18n("Templates Settings"), DesktopIcon("misc") ); m_pTemplatePage = new ClassifierListPage(newPage, (UMLClassifier *)c, m_pDoc, Uml::ot_Template); - QHBoxLayout* templatesLayout = new QHBoxLayout(newPage); + TQHBoxLayout* templatesLayout = new TQHBoxLayout(newPage); templatesLayout->addWidget(m_pTemplatePage); } if (ot == Uml::ot_Enum) { //setup enum literals page - QFrame* newPage = addPage( i18n("Enum Literals"), i18n("Enum Literals Settings"), DesktopIcon("misc") ); + TQFrame* newPage = addPage( i18n("Enum Literals"), i18n("Enum Literals Settings"), DesktopIcon("misc") ); m_pEnumLiteralPage = new ClassifierListPage(newPage, (UMLClassifier*)c, m_pDoc, Uml::ot_EnumLiteral); - QHBoxLayout* enumLiteralsLayout = new QHBoxLayout(newPage); + TQHBoxLayout* enumLiteralsLayout = new TQHBoxLayout(newPage); enumLiteralsLayout->addWidget(m_pEnumLiteralPage); } if (ot == Uml::ot_Entity) { //setup enum literals page - QFrame* newPage = addPage( i18n("Entity Attributes"), i18n("Entity Attributes Settings"), DesktopIcon("misc") ); + TQFrame* newPage = addPage( i18n("Entity Attributes"), i18n("Entity Attributes Settings"), DesktopIcon("misc") ); m_pEntityAttributePage = new ClassifierListPage(newPage, (UMLClassifier*)c, m_pDoc, Uml::ot_EntityAttribute); - QHBoxLayout* entityAttributesLayout = new QHBoxLayout(newPage); + TQHBoxLayout* entityAttributesLayout = new TQHBoxLayout(newPage); entityAttributesLayout->addWidget(m_pEntityAttributePage); } if (ot == Uml::ot_Package ) { // Set up containment page. - QFrame* newPage = addPage( i18n("Contents"), i18n("Contents Settings"), DesktopIcon("misc") ); + TQFrame* newPage = addPage( i18n("Contents"), i18n("Contents Settings"), DesktopIcon("misc") ); m_pPkgContentsPage = new PkgContentsPage(newPage, (UMLPackage*)(c)); - QHBoxLayout* contentsLayout = new QHBoxLayout(newPage); + TQHBoxLayout* contentsLayout = new TQHBoxLayout(newPage); contentsLayout->addWidget(m_pPkgContentsPage); } if (assoc) { - QFrame* newPage = addPage(i18n("Associations"), i18n("Class Associations"), DesktopIcon( "misc") ); + TQFrame* newPage = addPage(i18n("Associations"), i18n("Class Associations"), DesktopIcon( "misc") ); m_pAssocPage = new AssocPage(newPage, UMLApp::app()->getCurrentView(), m_pObject); - QHBoxLayout* assocLayout = new QHBoxLayout(newPage); + TQHBoxLayout* assocLayout = new TQHBoxLayout(newPage); assocLayout -> addWidget(m_pAssocPage); } else { m_pAssocPage = 0; @@ -229,8 +229,8 @@ void ClassPropDlg::setupPages(UMLObject * c, bool assoc) { } void ClassPropDlg::setupInstancePages(UMLWidget* widget) { - QFrame* page = addPage( i18n("General"), i18n("General Settings"), DesktopIcon("misc") ); - QHBoxLayout* genLayout = new QHBoxLayout(page); + TQFrame* page = addPage( i18n("General"), i18n("General Settings"), DesktopIcon("misc") ); + TQHBoxLayout* genLayout = new TQHBoxLayout(page); page->setMinimumSize(310, 330); m_pGenPage = new ClassGenPage(m_pDoc, page, widget); genLayout->addWidget(m_pGenPage); @@ -240,8 +240,8 @@ void ClassPropDlg::setupInstancePages(UMLWidget* widget) { void ClassPropDlg::setupFontPage() { if( !m_pWidget ) return; - QVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts") ); - m_pChooser = new KFontChooser( (QWidget*)page, "font", false, QStringList(), false); + TQVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts") ); + m_pChooser = new KFontChooser( (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 90c5b4ec..6a107ad7 100644 --- a/umbrello/umbrello/dialogs/classpropdlg.h +++ b/umbrello/umbrello/dialogs/classpropdlg.h @@ -49,7 +49,7 @@ public: * @param pageNum The page to show first. * @param assoc Determines whether to display associations */ - ClassPropDlg(QWidget *parent, UMLObject *c, int pageNum = 0, bool assoc = false); + ClassPropDlg(TQWidget *parent, UMLObject *c, int pageNum = 0, bool assoc = false); /** * Sets up a ClassPropDlg. @@ -57,7 +57,7 @@ public: * @param parent The parent of the ClassPropDlg * @param o The ObjectWidget to display properties of. */ - ClassPropDlg(QWidget *parent, ObjectWidget * o); + ClassPropDlg(TQWidget *parent, ObjectWidget * o); /** * Sets up a ClassPropDlg. @@ -65,7 +65,7 @@ public: * @param parent The parent of the ClassPropDlg * @param o The UMLWidget to display properties of. */ - ClassPropDlg(QWidget *parent, UMLWidget * o); + ClassPropDlg(TQWidget *parent, UMLWidget * o); /** diff --git a/umbrello/umbrello/dialogs/classwizard.cpp b/umbrello/umbrello/dialogs/classwizard.cpp index 7ac1cb27..c49e418f 100644 --- a/umbrello/umbrello/dialogs/classwizard.cpp +++ b/umbrello/umbrello/dialogs/classwizard.cpp @@ -26,13 +26,13 @@ #include "../umlclassifierlistitemlist.h" #include "../classifierlistitem.h" -ClassWizard::ClassWizard( UMLDoc * pDoc ) : KWizard( (QWidget*)pDoc -> parent(), "_CLASSWIZARD_", true) { +ClassWizard::ClassWizard( UMLDoc * pDoc ) : KWizard( (TQWidget*)pDoc -> parent(), "_CLASSWIZARD_", true) { m_pDoc = pDoc; //create a unique class to start with UMLObject * pTemp = 0; - QString name = i18n("new_class"); - QString newName = name; - QString num = ""; + TQString name = i18n("new_class"); + TQString newName = name; + TQString num = ""; int i = 0; m_pClass = new UMLClassifier( newName ); do { @@ -63,42 +63,42 @@ void ClassWizard::setupPages() { addPage( m_pOpPage, i18n("Class Operations") ); } -void ClassWizard::showPage( QWidget * pWidget ) { - QWizard::showPage( pWidget ); +void ClassWizard::showPage( TQWidget * pWidget ) { + TQWizard::showPage( pWidget ); if( pWidget == m_pOpPage ) finishButton() -> setEnabled( true ); } void ClassWizard::next() { - QWidget * pWidget = currentPage(); + TQWidget * pWidget = currentPage(); if( pWidget == m_pGenPage ) { m_pGenPage -> updateObject(); } else if( pWidget == m_pAttPage ) { m_pAttPage -> updateObject(); } - QWizard::next(); + TQWizard::next(); } void ClassWizard::back() { - QWidget * pWidget = currentPage(); + TQWidget * pWidget = currentPage(); if( pWidget == m_pAttPage ) { m_pAttPage -> updateObject(); } else if( pWidget == m_pOpPage ) { m_pOpPage -> updateObject(); } - QWizard::back(); + TQWizard::back(); } void ClassWizard::accept() { m_pDoc -> addUMLObject( m_pClass ); m_pDoc->signalUMLObjectCreated(m_pClass); - QWizard::accept(); + TQWizard::accept(); } void ClassWizard::reject() { delete m_pClass; - QWizard::reject(); + TQWizard::reject(); } void ClassWizard::help() { diff --git a/umbrello/umbrello/dialogs/classwizard.h b/umbrello/umbrello/dialogs/classwizard.h index bc2dabf8..77fde177 100644 --- a/umbrello/umbrello/dialogs/classwizard.h +++ b/umbrello/umbrello/dialogs/classwizard.h @@ -41,7 +41,7 @@ protected: /** * Overrides the default method. */ - void showPage( QWidget * pWidget ); + void showPage( TQWidget * pWidget ); /** * Overrides the default method. diff --git a/umbrello/umbrello/dialogs/codeeditor.cpp b/umbrello/umbrello/dialogs/codeeditor.cpp index c05b80bb..9fe17afc 100644 --- a/umbrello/umbrello/dialogs/codeeditor.cpp +++ b/umbrello/umbrello/dialogs/codeeditor.cpp @@ -22,13 +22,13 @@ #include "codeeditor.h" // qt/kde includes -#include <qkeysequence.h> -#include <qcursor.h> -#include <qcolor.h> -#include <qlabel.h> -#include <qbrush.h> -#include <qlayout.h> -#include <qregexp.h> +#include <tqkeysequence.h> +#include <tqcursor.h> +#include <tqcolor.h> +#include <tqlabel.h> +#include <tqbrush.h> +#include <tqlayout.h> +#include <tqregexp.h> #include <kdebug.h> #include <klocale.h> @@ -55,14 +55,14 @@ #include "umlroledialog.h" #include "umloperationdialog.h" -CodeEditor::CodeEditor ( const QString & text, const QString & context, CodeViewerDialog * parent, const char * name , CodeDocument * doc) - : QTextEdit ( text, context, parent, name) +CodeEditor::CodeEditor ( const TQString & text, const TQString & context, CodeViewerDialog * parent, const char * name , CodeDocument * doc) + : TQTextEdit ( text, context, parent, name) { init(parent, doc); } CodeEditor::CodeEditor ( CodeViewerDialog * parent, const char* name, CodeDocument * doc ) - : QTextEdit ( parent, name ) + : TQTextEdit ( parent, name ) { init(parent, doc); } @@ -90,7 +90,7 @@ Settings::CodeViewerState CodeEditor::getState() return m_parentDlg->getState(); } -QLabel * CodeEditor::getComponentLabel() { +TQLabel * CodeEditor::getComponentLabel() { return m_parentDlg->componentLabel; } @@ -98,7 +98,7 @@ QLabel * CodeEditor::getComponentLabel() { // FIX: used only for debugging right now.. eliminate eventually -b.t. void CodeEditor::clicked(int para, int pos) { - getComponentLabel()->setText("para:"+QString::number(para)+" pos:"+QString::number(pos)); + getComponentLabel()->setText("para:"+TQString::number(para)+" pos:"+TQString::number(pos)); } @@ -112,7 +112,7 @@ bool CodeEditor::close ( bool alsoDelete ) m_lastTextBlockToBeEdited = 0; } - return QTextEdit::close(alsoDelete); + return TQTextEdit::close(alsoDelete); } @@ -177,14 +177,14 @@ void CodeEditor::editTextBlock(TextBlock * tBlock, int para) { } // return whether is empty or just whitespace -bool CodeEditor::StringIsBlank(const QString &str) +bool CodeEditor::StringIsBlank(const TQString &str) { if(str.isEmpty() || str.stripWhiteSpace().isEmpty()) return true; return false; } -void CodeEditor::keyPressEvent ( QKeyEvent * e ) { +void CodeEditor::keyPressEvent ( TQKeyEvent * e ) { // kDebug() <<"KEY PRESS EVENT:["<<e->text().latin1()<<"] ascii CODE:"<<e->ascii(); @@ -195,7 +195,7 @@ void CodeEditor::keyPressEvent ( QKeyEvent * e ) { if((e->ascii() == 10) || (e->ascii() == 13) || (e->text() == "\r\n")) m_newLinePressed = true; - QTextEdit::keyPressEvent(e); + TQTextEdit::keyPressEvent(e); } void CodeEditor::loadFromDocument () @@ -205,12 +205,12 @@ void CodeEditor::loadFromDocument () clearText(); // set caption on tool - QString caption = m_parentDoc->getFileName() + m_parentDoc->getFileExtension(); + TQString caption = m_parentDoc->getFileName() + m_parentDoc->getFileExtension(); setCaption( tr2i18n( caption.latin1() ) ); // header for document - QString header = m_parentDoc->getHeader()->toString(); - QString componentName = QString("header for file ") +caption; + TQString header = m_parentDoc->getHeader()->toString(); + TQString componentName = TQString("header for file ") +caption; if(!StringIsBlank(header)) insert(header,m_parentDoc->getHeader(),false,getState().fontColor, getState().nonEditBlockColor,0,componentName); @@ -223,7 +223,7 @@ void CodeEditor::loadFromDocument () } -void CodeEditor::insert (const QString & text, TextBlock * parent, bool editable, const QColor & fgcolor, const QColor & bgcolor, UMLObject * umlobj, const QString & displayName, int startLine) +void CodeEditor::insert (const TQString & text, TextBlock * parent, bool editable, const TQColor & fgcolor, const TQColor & bgcolor, UMLObject * umlobj, const TQString & displayName, int startLine) { // set some params @@ -235,19 +235,19 @@ void CodeEditor::insert (const QString & text, TextBlock * parent, bool editable if(startLine == -1) { startLine = paragraphs()-1; - QTextEdit::append(text); // put actual text in. Use insert instead of append so history is preserved? + TQTextEdit::append(text); // put actual text in. Use insert instead of append so history is preserved? } else { isInsert = true; - QTextEdit::insertAt(text, startLine, 0); + TQTextEdit::insertAt(text, startLine, 0); } // actual put in text // now do 'paragraph' background highlighting // int endLine = paragraphs()-2; - int endLine = text.contains(QRegExp("\n")) + startLine -1; + int endLine = text.contains(TQRegExp("\n")) + startLine -1; if(m_isHighlighted) for(int para=startLine;para<=endLine;para++) setParagraphBackgroundColor(para,bgcolor); @@ -297,7 +297,7 @@ void CodeEditor::insert (const QString & text, TextBlock * parent, bool editable // that are greater than zero in that type of textblock int increase = size + 1; - QMap<TextBlock*,TextBlockInfo*>::Iterator it; + TQMap<TextBlock*,TextBlockInfo*>::Iterator it; for ( it = m_tbInfoMap->begin(); it != m_tbInfoMap->end(); ++it ) { TextBlock * tblock = it.key(); @@ -363,18 +363,18 @@ void CodeEditor::appendText(TextBlockList * items) } -void CodeEditor::appendText (CodeComment * comment, TextBlock * parent, UMLObject * umlObj , const QString & componentName) +void CodeEditor::appendText (CodeComment * comment, TextBlock * parent, UMLObject * umlObj , const TQString & componentName) { if(!comment->getWriteOutText() && !m_showHiddenBlocks) return; - QColor bgcolor = getState().nonEditBlockColor; + TQColor bgcolor = getState().nonEditBlockColor; if(!comment->getWriteOutText() && m_showHiddenBlocks) bgcolor = getState().hiddenColor; - QString indent = comment->getIndentationString(); - QString text = comment->toString(); // use comment formatting, NOT formatMultiLineText(comment->toString(), indent, "\n"); + TQString indent = comment->getIndentationString(); + TQString text = comment->toString(); // use comment formatting, NOT formatMultiLineText(comment->toString(), indent, "\n"); if(!StringIsBlank(text)) insert(text,parent,true,getState().fontColor, bgcolor, umlObj, componentName); @@ -385,11 +385,11 @@ void CodeEditor::appendText (CodeBlockWithComments * cb ) { if(!cb->getWriteOutText() && !m_showHiddenBlocks) return; - QString indent = cb->getIndentationString(); - QString body = cb->formatMultiLineText (cb->getText(), indent, "\n"); + TQString indent = cb->getIndentationString(); + TQString body = cb->formatMultiLineText (cb->getText(), indent, "\n"); - QColor bgcolor = getState().editBlockColor; - QString componentName = QString("CodeBlock"); + TQColor bgcolor = getState().editBlockColor; + TQString componentName = TQString("CodeBlock"); appendText(cb->getComment(), cb, 0, componentName); @@ -406,13 +406,13 @@ void CodeEditor::appendText (CodeClassFieldDeclarationBlock * db ) { if(!db->getWriteOutText() && !m_showHiddenBlocks) return; - QString indent = db->getIndentationString(); - QString body = db->formatMultiLineText (db->getText(), indent, "\n"); + TQString indent = db->getIndentationString(); + TQString body = db->formatMultiLineText (db->getText(), indent, "\n"); UMLObject * parentObj = db->getParentClassField()->getParentObject(); - QColor bgcolor = getState().editBlockColor; - QString componentName = QString(""); + TQColor bgcolor = getState().editBlockColor; + TQString componentName = TQString(""); if(parentObj) { if(db->getParentClassField()->parentIsAttribute()) { @@ -443,13 +443,13 @@ void CodeEditor::appendText (CodeMethodBlock * mb) { if(!mb->getWriteOutText() && (!m_showHiddenBlocks || dynamic_cast<CodeAccessorMethod*>(mb))) return; - QColor bgcolor = getState().umlObjectColor; - QString indent = mb->getIndentationString(); - QString bodyIndent = mb->getIndentationString(mb->getIndentationLevel()+1); + TQColor bgcolor = getState().umlObjectColor; + TQString indent = mb->getIndentationString(); + TQString bodyIndent = mb->getIndentationString(mb->getIndentationLevel()+1); - QString startText = mb->formatMultiLineText ( mb->getStartMethodText(), indent, "\n"); - QString body = mb->formatMultiLineText (mb->getText(), bodyIndent, "\n"); - QString endText = mb->formatMultiLineText( mb->getEndMethodText(), indent, "\n"); + TQString startText = mb->formatMultiLineText ( mb->getStartMethodText(), indent, "\n"); + TQString body = mb->formatMultiLineText (mb->getText(), bodyIndent, "\n"); + TQString endText = mb->formatMultiLineText( mb->getEndMethodText(), indent, "\n"); if(body.isEmpty()) body = " \n"; @@ -460,7 +460,7 @@ void CodeEditor::appendText (CodeMethodBlock * mb) { bgcolor = getState().hiddenColor; } - QString componentName = QString("<b>parentless method\?</b>"); + TQString componentName = TQString("<b>parentless method\?</b>"); // ugly, but we need to know if there is a parent object here. CodeOperation * op = dynamic_cast<CodeOperation*>(mb); @@ -504,11 +504,11 @@ void CodeEditor::appendText (TextBlock * tb) { if(!tb->getWriteOutText() && !m_showHiddenBlocks) return; - QColor bgcolor = getState().nonEditBlockColor; + TQColor bgcolor = getState().nonEditBlockColor; if(!tb->getWriteOutText() && m_showHiddenBlocks) bgcolor = getState().hiddenColor; - QString str = tb->toString(); + TQString str = tb->toString(); insert(str,tb,false,getState().fontColor,bgcolor); } @@ -521,14 +521,14 @@ void CodeEditor::appendText(HierarchicalCodeBlock * hblock) OwnedHierarchicalCodeBlock * test = dynamic_cast<OwnedHierarchicalCodeBlock *>(hblock); UMLObject * parentObj = 0; - QString componentName = QString(""); - QColor paperColor = getState().nonEditBlockColor; + TQString componentName = TQString(""); + TQColor paperColor = getState().nonEditBlockColor; if(test) { parentObj = test->getParentObject(); UMLClassifier *c = dynamic_cast<UMLClassifier*>(parentObj); if (c) { - QString typeStr; + TQString typeStr; if (c->isInterface()) typeStr = "Interface"; else @@ -545,9 +545,9 @@ void CodeEditor::appendText(HierarchicalCodeBlock * hblock) paperColor = getState().hiddenColor; TextBlockList * items = hblock->getTextBlockList(); - QString indent = hblock->getIndentationString(); - QString startText = hblock->formatMultiLineText ( hblock->getStartText(), indent, "\n"); - QString endText = hblock->formatMultiLineText( hblock->getEndText(), indent, "\n"); + TQString indent = hblock->getIndentationString(); + TQString startText = hblock->formatMultiLineText ( hblock->getStartText(), indent, "\n"); + TQString endText = hblock->formatMultiLineText( hblock->getEndText(), indent, "\n"); appendText(hblock->getComment(), hblock, parentObj, componentName); @@ -559,14 +559,14 @@ void CodeEditor::appendText(HierarchicalCodeBlock * hblock) } -void CodeEditor::insertParagraph ( const QString & text, int para ) +void CodeEditor::insertParagraph ( const TQString & text, int para ) { - QTextEdit::insertParagraph(text,para); + TQTextEdit::insertParagraph(text,para); } void CodeEditor::removeParagraph ( int para ) { - QTextEdit::removeParagraph(para); + TQTextEdit::removeParagraph(para); } // All umlobjects which may have pop-up boxes should return true here @@ -623,10 +623,10 @@ void CodeEditor::slotInsertCodeBlockBeforeSelected() int location = m_textBlockList.findRef(m_selectedTextBlock); // find first para of selected block - QString body = newBlock->formatMultiLineText (newBlock->getText(), newBlock->getIndentationString(), "\n"); + TQString body = newBlock->formatMultiLineText (newBlock->getText(), newBlock->getIndentationString(), "\n"); insert(body,newBlock,true,getState().fontColor, - getState().editBlockColor,0,QString("CodeBlock"),location); + getState().editBlockColor,0,TQString("CodeBlock"),location); } @@ -645,21 +645,21 @@ void CodeEditor::slotInsertCodeBlockAfterSelected() ParaInfo * lastpi = tbinfo->m_paraList.last(); int location = m_textBlockList.findRef(m_selectedTextBlock) + lastpi->start + lastpi->size + 1; - QString body = newBlock->formatMultiLineText (newBlock->getText(), newBlock->getIndentationString(), "\n"); + TQString body = newBlock->formatMultiLineText (newBlock->getText(), newBlock->getIndentationString(), "\n"); insert(body,newBlock,true,getState().fontColor, - getState().editBlockColor,0,QString("CodeBlock"),location); + getState().editBlockColor,0,TQString("CodeBlock"),location); } -QPopupMenu * CodeEditor::createPopupMenu ( const QPoint & pos ) +TQPopupMenu * CodeEditor::createPopupMenu ( const TQPoint & pos ) { TextBlock * tb = m_selectedTextBlock; m_lastPara = paragraphAt(pos); - QPopupMenu * menu = new QPopupMenu(this); - // ugh. A bug in the Qt interaction between QTextEdit and Menu + TQPopupMenu * menu = new TQPopupMenu(this); + // ugh. A bug in the Qt interaction between TQTextEdit and Menu // can sometimes trigger a clear() call of the text area after // the popup menu is destroyed. The workaround is to disable // the behavior by blocking the destroy signal from the menu. @@ -668,26 +668,26 @@ QPopupMenu * CodeEditor::createPopupMenu ( const QPoint & pos ) if (m_selectedTextBlock) { if(tb->getWriteOutText()) - menu->insertItem("Hide",this,SLOT(slotChangeSelectedBlockView()), Key_H, 0); + menu->insertItem("Hide",this,TQT_SLOT(slotChangeSelectedBlockView()), Key_H, 0); else - menu->insertItem("Show",this,SLOT(slotChangeSelectedBlockView()), Key_S, 0); + menu->insertItem("Show",this,TQT_SLOT(slotChangeSelectedBlockView()), Key_S, 0); CodeBlockWithComments * cb = dynamic_cast<CodeBlockWithComments*>(tb); if(cb) if(cb->getComment()->getWriteOutText()) - menu->insertItem("Hide Comment",this,SLOT(slotChangeSelectedBlockCommentView()), CTRL+Key_H, 1); + menu->insertItem("Hide Comment",this,TQT_SLOT(slotChangeSelectedBlockCommentView()), CTRL+Key_H, 1); else - menu->insertItem("Show Comment",this,SLOT(slotChangeSelectedBlockCommentView()), CTRL+Key_S, 1); + menu->insertItem("Show Comment",this,TQT_SLOT(slotChangeSelectedBlockCommentView()), CTRL+Key_S, 1); menu->insertSeparator(); - menu->insertItem("Insert Code Block Before",this,SLOT(slotInsertCodeBlockBeforeSelected()), CTRL+Key_B, 2); - menu->insertItem("Insert Code Block After",this,SLOT(slotInsertCodeBlockAfterSelected()), CTRL+Key_A, 3); + menu->insertItem("Insert Code Block Before",this,TQT_SLOT(slotInsertCodeBlockBeforeSelected()), CTRL+Key_B, 2); + menu->insertItem("Insert Code Block After",this,TQT_SLOT(slotInsertCodeBlockAfterSelected()), CTRL+Key_A, 3); menu->insertSeparator(); - menu->insertItem("Copy",this,SLOT(slotCopyTextBlock()), CTRL+Key_C, 4); - menu->insertItem("Paste",this,SLOT(slotPasteTextBlock()), CTRL+Key_V, 5); - menu->insertItem("Cut",this,SLOT(slotCutTextBlock()), CTRL+Key_X, 6); + menu->insertItem("Copy",this,TQT_SLOT(slotCopyTextBlock()), CTRL+Key_C, 4); + menu->insertItem("Paste",this,TQT_SLOT(slotPasteTextBlock()), CTRL+Key_V, 5); + menu->insertItem("Cut",this,TQT_SLOT(slotCutTextBlock()), CTRL+Key_X, 6); // enable/disable based on conditions if(m_selectedTextBlock == m_parentDoc->getHeader()) @@ -783,7 +783,7 @@ void CodeEditor::init ( CodeViewerDialog * parentDlg, CodeDocument * parentDoc ) m_parentDoc = parentDoc; setUndoRedoEnabled( false ); - setCursor( QCursor( 0 ) ); + setCursor( TQCursor( 0 ) ); setMouseTracking( true ); setReadOnly (true); m_isHighlighted = getState().blocksAreHighlighted; @@ -794,7 +794,7 @@ void CodeEditor::init ( CodeViewerDialog * parentDlg, CodeDocument * parentDoc ) m_textBlockToPaste = 0; m_selectedTextBlock = 0; m_lastTextBlockToBeEdited = 0; - m_tbInfoMap = new QMap<TextBlock *, TextBlockInfo*>; + m_tbInfoMap = new TQMap<TextBlock *, TextBlockInfo*>; setFont( getState().font ); @@ -808,15 +808,15 @@ void CodeEditor::init ( CodeViewerDialog * parentDlg, CodeDocument * parentDoc ) // set some viewability parameters //int margin = fontMetrics().height(); - QBrush pbrush = QBrush ( getState().paperColor); + TQBrush pbrush = TQBrush ( getState().paperColor); setPaper(pbrush); // setMargin(margin); - // connect(this,SIGNAL(newLinePressed()),this,SLOT(newLinePressed())); - // connect(this,SIGNAL(backspacePressed()),this,SLOT(backspacePressed())); - connect(this,SIGNAL(doubleClicked(int,int)),this,SLOT(doubleClicked(int,int))); - connect(this,SIGNAL(cursorPositionChanged(int,int)),this,SLOT(cursorPositionChanged(int,int))); + // connect(this,TQT_SIGNAL(newLinePressed()),this,TQT_SLOT(newLinePressed())); + // connect(this,TQT_SIGNAL(backspacePressed()),this,TQT_SLOT(backspacePressed())); + connect(this,TQT_SIGNAL(doubleClicked(int,int)),this,TQT_SLOT(doubleClicked(int,int))); + connect(this,TQT_SIGNAL(cursorPositionChanged(int,int)),this,TQT_SLOT(cursorPositionChanged(int,int))); // do this last loadFromDocument(); @@ -828,16 +828,16 @@ void CodeEditor::updateTextBlockFromText (TextBlock * block) { if (block) { CodeMethodBlock * cmb = dynamic_cast<CodeMethodBlock*>(block); - //QString baseIndent = block->getNewEditorLine(block->getIndentationLevel()+(cmb ? 1 : 0)); - QString baseIndent = block->getIndentationString(block->getIndentationLevel()+(cmb ? 1 : 0)); + //TQString baseIndent = block->getNewEditorLine(block->getIndentationLevel()+(cmb ? 1 : 0)); + TQString baseIndent = block->getIndentationString(block->getIndentationLevel()+(cmb ? 1 : 0)); TextBlockInfo *info = (*m_tbInfoMap)[block]; UMLObject * parentObj = info->getParent(); int pstart = m_textBlockList.findRef(block); - QString content = ""; + TQString content = ""; // Assemble content from editiable paras - QPtrList<ParaInfo> list = info->m_paraList; + TQPtrList<ParaInfo> list = info->m_paraList; for(ParaInfo * item = list.first(); item; item=list.next()) { if(item->isEditable) @@ -847,7 +847,7 @@ void CodeEditor::updateTextBlockFromText (TextBlock * block) { int lastLineToAddNewLine = lastpara + endEdit; for(int para=(item->start+pstart);para<=lastpara;para++) { - QString line = block->unformatText(text(para), baseIndent); + TQString line = block->unformatText(text(para), baseIndent); content += line; // \n are implicit in the editor (!) so we should put them // back in, if there is any content from the line @@ -907,13 +907,13 @@ void CodeEditor::cursorPositionChanged(int para, int pos) CodeMethodBlock * cmb = dynamic_cast<CodeMethodBlock*>(tBlock); // auto-indent new lines - QString currentParaText = text(para); - QString baseIndent = tBlock->getNewEditorLine(tBlock->getIndentationLevel()+(cmb ? 1 : 0)); + TQString currentParaText = text(para); + TQString baseIndent = tBlock->getNewEditorLine(tBlock->getIndentationLevel()+(cmb ? 1 : 0)); // cerr<<"AUTO INDENT:["<<baseIndent.latin1()<<"] isMethod?"<<(cmb?"true":"false")<<endl; int minPos = baseIndent.length(); // add indent chars to the current line, if missing - if(!m_backspacePressed && !currentParaText.contains(QRegExp('^'+baseIndent))) + if(!m_backspacePressed && !currentParaText.contains(TQRegExp('^'+baseIndent))) { insertAt(baseIndent,para,0); setCursorPosition(para,pos+minPos); @@ -929,7 +929,7 @@ void CodeEditor::cursorPositionChanged(int para, int pos) int endOfPriorLine = paragraphLength(para-1); // IN this case, we remove old (para) line, and tack its // contents on the line we are going to. - QString contents = text(para); + TQString contents = text(para); contents = contents.right(contents.length()-m_lastPos+1); // this next thing happens when we arent deleting last line @@ -949,7 +949,7 @@ void CodeEditor::cursorPositionChanged(int para, int pos) // the indentation if(m_backspacePressed && !priorParaIsEditable) { - QString contents = text(para); + TQString contents = text(para); contents = contents.right(contents.length()-m_lastPos+1); contents = baseIndent + contents.left(contents.length()-1); // left is to remove trailing space insertParagraph(contents,para+1); @@ -957,7 +957,7 @@ void CodeEditor::cursorPositionChanged(int para, int pos) // furthermore, IF its nothing but indentation + whitespace // we switch this back to Auto-Generated. - if(cmb && contents.contains(QRegExp('^'+baseIndent+"\\s$"))) + if(cmb && contents.contains(TQRegExp('^'+baseIndent+"\\s$"))) { cmb->setContentType(CodeBlock::AutoGenerated); cmb->syncToParent(); @@ -1008,7 +1008,7 @@ bool CodeEditor::paraIsNotSingleLine (int para) { int pstart = m_textBlockList.findRef(tBlock); TextBlockInfo *info = (*m_tbInfoMap)[tBlock]; - QPtrList<ParaInfo> list = info->m_paraList; + TQPtrList<ParaInfo> list = info->m_paraList; for(ParaInfo * item = list.first(); item; item=list.next()) if((pstart+item->start) <= para && (item->start+pstart+item->size) >= para ) @@ -1032,7 +1032,7 @@ bool CodeEditor::isParaEditable (int para) { TextBlockInfo *info = (*m_tbInfoMap)[tBlock]; int pstart = m_textBlockList.findRef(tBlock); int relativeLine = para - pstart; - QPtrList<ParaInfo> list = info->m_paraList; + TQPtrList<ParaInfo> list = info->m_paraList; for(ParaInfo * item = list.first(); item; item=list.next()) { if((item->start+pstart) <= para && (item->start+pstart+item->size) >= para) @@ -1054,7 +1054,7 @@ void CodeEditor::changeTextBlockHighlighting(TextBlock * tBlock, bool selected) if(tBlock) { TextBlockInfo *info = (*m_tbInfoMap)[tBlock]; - QPtrList<ParaInfo> list = info->m_paraList; + TQPtrList<ParaInfo> list = info->m_paraList; int pstart = m_textBlockList.findRef(tBlock); for(ParaInfo * item = list.first(); item; item=list.next()) for(int p=(item->start+pstart);p<=(item->start+pstart+item->size);p++) @@ -1115,7 +1115,7 @@ void CodeEditor::contractSelectedParagraph( int paraToRemove ) { { int pstart = m_textBlockList.findRef(tBlock); TextBlockInfo *info = (*m_tbInfoMap)[tBlock]; - QPtrList<ParaInfo> list = info->m_paraList; + TQPtrList<ParaInfo> list = info->m_paraList; bool lowerStartPosition = false; for(ParaInfo * item = list.first(); item; item=list.next()) @@ -1148,7 +1148,7 @@ void CodeEditor::expandSelectedParagraph( int priorPara ) { // add this tBlock in m_textBlockList.insert(priorPara,tBlock); TextBlockInfo *info = (*m_tbInfoMap)[tBlock]; - QPtrList<ParaInfo> list = info->m_paraList; + TQPtrList<ParaInfo> list = info->m_paraList; int pstart = m_textBlockList.findRef(tBlock); // now update the paragraph information @@ -1170,7 +1170,7 @@ void CodeEditor::expandSelectedParagraph( int priorPara ) { } -void CodeEditor::contentsMouseMoveEvent ( QMouseEvent * e ) +void CodeEditor::contentsMouseMoveEvent ( TQMouseEvent * e ) { int para = paragraphAt(e->pos()); @@ -1212,7 +1212,7 @@ void CodeEditor::contentsMouseMoveEvent ( QMouseEvent * e ) // If connections are right, then the UMLObject will send out the modified() // signal which will trigger a call to re-generate the appropriate code within // the code document. Our burden is to appropriately prepare the tool: we clear -// out ALL the textblocks in the QTextEdit widget and then re-show them +// out ALL the textblocks in the TQTextEdit widget and then re-show them // after the dialog disappears void CodeEditor::rebuildView( int startCursorPos ) { diff --git a/umbrello/umbrello/dialogs/codeeditor.h b/umbrello/umbrello/dialogs/codeeditor.h index 57f1fb37..5956e3ab 100644 --- a/umbrello/umbrello/dialogs/codeeditor.h +++ b/umbrello/umbrello/dialogs/codeeditor.h @@ -19,10 +19,10 @@ #ifndef CODEEDITOR_H #define CODEEDITOR_H -#include <qpopupmenu.h> -#include <qstring.h> -#include <qlabel.h> -#include <qtextedit.h> +#include <tqpopupmenu.h> +#include <tqstring.h> +#include <tqlabel.h> +#include <tqtextedit.h> #include "../codeviewerstate.h" #include "../textblocklist.h" @@ -45,7 +45,7 @@ class CodeEditor : public QTextEdit Q_OBJECT public: - explicit CodeEditor ( const QString & text, const QString & context = QString(), CodeViewerDialog * parent = 0, const char * name = 0 , CodeDocument * doc = 0); + explicit CodeEditor ( const TQString & text, const TQString & context = TQString(), CodeViewerDialog * parent = 0, const char * name = 0 , CodeDocument * doc = 0); explicit CodeEditor ( CodeViewerDialog * parent, const char* name = 0, CodeDocument * doc = 0); ~CodeEditor (); @@ -62,7 +62,7 @@ protected: void appendText (CodeClassFieldDeclarationBlock * db ); void appendText (TextBlockList * items); void appendText (CodeMethodBlock * mb); - void appendText (CodeComment * comment, TextBlock * parent, UMLObject * umlObj = 0, const QString & compName=""); + void appendText (CodeComment * comment, TextBlock * parent, UMLObject * umlObj = 0, const TQString & compName=""); void appendText (CodeBlockWithComments * cb ); // Rebuild our view of the document. Happens whenever we change @@ -71,26 +71,26 @@ protected: // If connections are right, then the UMLObject will send out the modified() // signal which will trigger a call to re-generate the appropriate code within // the code document. Our burden is to appropriately prepare the tool: we clear - // out ALL the textblocks in the QTextEdit widget and then re-show them + // out ALL the textblocks in the TQTextEdit widget and then re-show them // after the dialog disappears void rebuildView( int startCursorPos ); // override the QT event so we can do appropriate things - void contentsMouseMoveEvent ( QMouseEvent * e ); + void contentsMouseMoveEvent ( TQMouseEvent * e ); // implemented so we may capture certain key presses, namely backspace // and 'return' events. - void keyPressEvent ( QKeyEvent * e ); + void keyPressEvent ( TQKeyEvent * e ); // (re) load the parent code document into the editor void loadFromDocument(); // specialized popup menu for our tool - QPopupMenu * createPopupMenu ( const QPoint & pos ); + TQPopupMenu * createPopupMenu ( const TQPoint & pos ); private: - QString parentDocName; + TQString parentDocName; CodeDocument * m_parentDoc; CodeViewerDialog * m_parentDlg; @@ -106,17 +106,17 @@ private: TextBlock * m_selectedTextBlock; TextBlock * m_lastTextBlockToBeEdited; - QMap<TextBlock*, TextBlockInfo*> *m_tbInfoMap; + TQMap<TextBlock*, TextBlockInfo*> *m_tbInfoMap; TextBlockList m_textBlockList; // main insert routine. Will append if startline is not supplied. - void insert (const QString & text, TextBlock * parent, bool isEditable = false, - const QColor & fgcolor = QColor("black"), const QColor & bgcolor = QColor("white"), - UMLObject * umlobj = 0, const QString & displayName = "", int startLine = -1); + void insert (const TQString & text, TextBlock * parent, bool isEditable = false, + const TQColor & fgcolor = TQColor("black"), const TQColor & bgcolor = TQColor("white"), + UMLObject * umlobj = 0, const TQString & displayName = "", int startLine = -1); void editTextBlock(TextBlock * tBlock, int para); void clearText(); - QLabel * getComponentLabel(); + TQLabel * getComponentLabel(); bool paraIsNotSingleLine (int para); void expandSelectedParagraph( int where ); void contractSelectedParagraph( int where ); @@ -131,11 +131,11 @@ private: // return whether or not the passed string is empty or // contains nothing but whitespace - static bool StringIsBlank( const QString &str ); + static bool StringIsBlank( const TQString &str ); public slots: - void insertParagraph ( const QString & text, int para ); + void insertParagraph ( const TQString & text, int para ); void removeParagraph ( int para ); void changeHighlighting(int signal); void changeShowHidden (int signal); @@ -167,8 +167,8 @@ class ParaInfo { public: int start; // this is a relative offset from the beginning of the tblock int size; - QColor fgcolor; - QColor bgcolor; + TQColor fgcolor; + TQColor bgcolor; bool isEditable; ParaInfo () { isEditable = false; } @@ -176,9 +176,9 @@ public: class TextBlockInfo { public: - QPtrList<ParaInfo> m_paraList; + TQPtrList<ParaInfo> m_paraList; UMLObject * m_parent; - QString displayName; + TQString displayName; bool isClickable; bool isCodeAccessorMethod; diff --git a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp index f3dc25be..8fdb046c 100644 --- a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp +++ b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp @@ -17,7 +17,7 @@ // own header #include "codegenerationoptionspage.h" // qt/kde includes -#include <qcheckbox.h> +#include <tqcheckbox.h> #include <kdebug.h> // app includes #include "../codegenerator.h" @@ -33,11 +33,11 @@ #include <klocale.h> //qt include -#include <qlineedit.h> -#include <qlistview.h> -#include <qbuttongroup.h> +#include <tqlineedit.h> +#include <tqlistview.h> +#include <tqbuttongroup.h> -CodeGenerationOptionsPage::CodeGenerationOptionsPage(QWidget *parent) +CodeGenerationOptionsPage::CodeGenerationOptionsPage(TQWidget *parent) : CodeGenerationOptionsBase(parent) { init(); @@ -65,7 +65,7 @@ void CodeGenerationOptionsPage::init() m_SelectIndentationTypeBox->setCurrentItem(indentTypeToInteger(policy->getIndentationType())); m_SelectIndentationNumber->setValue(policy->getIndentationAmount()); - connect(this,SIGNAL(syncCodeDocumentsToParent()),gen,SLOT(syncCodeToDocument())); + connect(this,TQT_SIGNAL(syncCodeDocumentsToParent()),gen,TQT_SLOT(syncCodeToDocument())); // now insert the language-dependant page, should there be one updateCodeGenerationPolicyTab(); @@ -77,7 +77,7 @@ void CodeGenerationOptionsPage::setupActiveLanguageBox() { int indexCounter = 0; while (indexCounter < Uml::pl_Reserved) { - QString language = Model_Utils::progLangToString((Uml::Programming_Language) indexCounter); + TQString language = Model_Utils::progLangToString((Uml::Programming_Language) indexCounter); m_SelectLanguageBox->insertItem(language, indexCounter); indexCounter++; } @@ -135,7 +135,7 @@ void CodeGenerationOptionsPage::updateCodeGenerationPolicyTab() { else m_pCodePolicyPage = new DefaultCodeGenPolicyPage(languageOptionsFrame, "codelangpolicypage"); - connect(this,SIGNAL(applyClicked()),m_pCodePolicyPage,SLOT(apply())); + connect(this,TQT_SIGNAL(applyClicked()),m_pCodePolicyPage,TQT_SLOT(apply())); } @@ -145,7 +145,7 @@ void CodeGenerationOptionsPage::apply() { m_parentPolicy->setCodeVerboseDocumentComments(m_forceDoc->isChecked()); m_parentPolicy->setCodeVerboseSectionComments(m_forceSections->isChecked()); - m_parentPolicy->setOutputDirectory(QDir(m_outputDir->text())); + m_parentPolicy->setOutputDirectory(TQDir(m_outputDir->text())); m_parentPolicy->setIncludeHeadings(m_includeHeadings->isChecked()); m_parentPolicy->setHeadingFileDir(m_headingsDir->text()); m_parentPolicy->setOverwritePolicy((CodeGenerationPolicy::OverwritePolicy)m_overwriteGroup->id(m_overwriteGroup->selected())); @@ -171,8 +171,8 @@ void CodeGenerationOptionsPage::setDefaults() { void CodeGenerationOptionsPage::browseClicked() { - QString button = sender()->name(); - QString dir = KFileDialog::getExistingDirectory(); + TQString button = sender()->name(); + TQString dir = KFileDialog::getExistingDirectory(); if(dir.isEmpty()) return; if(button=="m_browseOutput") @@ -181,7 +181,7 @@ void CodeGenerationOptionsPage::browseClicked() { m_headingsDir->setText(dir); } -QString CodeGenerationOptionsPage::getCodeGenerationLanguage() { +TQString CodeGenerationOptionsPage::getCodeGenerationLanguage() { return m_SelectLanguageBox->currentText(); } diff --git a/umbrello/umbrello/dialogs/codegenerationoptionspage.h b/umbrello/umbrello/dialogs/codegenerationoptionspage.h index ff939d08..6cd7a2e7 100644 --- a/umbrello/umbrello/dialogs/codegenerationoptionspage.h +++ b/umbrello/umbrello/dialogs/codegenerationoptionspage.h @@ -21,7 +21,7 @@ #ifndef CODEGENERATIONOPTIONSPAGE_H #define CODEGENERATIONOPTIONSPAGE_H -#include <qwidget.h> +#include <tqwidget.h> #include "codegenerationoptionsbase.h" #include "../codegenerationpolicy.h" #include "../umlnamespace.h" @@ -40,10 +40,10 @@ class CodeGenerationPolicyPage; class CodeGenerationOptionsPage : public CodeGenerationOptionsBase { Q_OBJECT public: - CodeGenerationOptionsPage(QWidget *parent=0); + CodeGenerationOptionsPage(TQWidget *parent=0); ~CodeGenerationOptionsPage(); void setDefaults(); - QString getCodeGenerationLanguage(); + TQString getCodeGenerationLanguage(); void updateCodeGenerationPolicyTab(); void apply(); diff --git a/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp b/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp index 8deb3387..0e488e75 100644 --- a/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp +++ b/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp @@ -19,7 +19,7 @@ #include "codegenerationpolicypage.h" // qt/kde includes -#include <qlabel.h> +#include <tqlabel.h> #include <klocale.h> // local includes @@ -29,7 +29,7 @@ /** This is the page which comes up IF there is no special options for the * code generator. */ -CodeGenerationPolicyPage::CodeGenerationPolicyPage( QWidget *parent, const char *name, CodeGenPolicyExt * policy ) +CodeGenerationPolicyPage::CodeGenerationPolicyPage( TQWidget *parent, const char *name, CodeGenPolicyExt * policy ) :CodeGenerationPolicyBase(parent,name) { m_parentPolicy = policy; diff --git a/umbrello/umbrello/dialogs/codegenerationpolicypage.h b/umbrello/umbrello/dialogs/codegenerationpolicypage.h index 16590dd3..959e34aa 100644 --- a/umbrello/umbrello/dialogs/codegenerationpolicypage.h +++ b/umbrello/umbrello/dialogs/codegenerationpolicypage.h @@ -20,7 +20,7 @@ #ifndef CODEGENERATIONPOLICYPAGE_H #define CODEGENERATIONPOLICYPAGE_H -#include <qwidget.h> +#include <tqwidget.h> #include "codegenerationpolicybase.h" class CodeGenPolicyExt; @@ -32,7 +32,7 @@ class CodeGenPolicyExt; class CodeGenerationPolicyPage : public CodeGenerationPolicyBase { Q_OBJECT public: - explicit CodeGenerationPolicyPage (QWidget *parent=0, const char *name=0, CodeGenPolicyExt * policy = 0); + explicit CodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, CodeGenPolicyExt * policy = 0); virtual ~CodeGenerationPolicyPage(); diff --git a/umbrello/umbrello/dialogs/codegenerationwizard.cpp b/umbrello/umbrello/dialogs/codegenerationwizard.cpp index ca726398..b64e30dc 100644 --- a/umbrello/umbrello/dialogs/codegenerationwizard.cpp +++ b/umbrello/umbrello/dialogs/codegenerationwizard.cpp @@ -21,10 +21,10 @@ #include "codegenerationwizard.h" // qt/kde includes -#include <qdir.h> -#include <qlistview.h> -#include <qfileinfo.h> -#include <qapplication.h> +#include <tqdir.h> +#include <tqlistview.h> +#include <tqfileinfo.h> +#include <tqapplication.h> #include <kdebug.h> #include <klocale.h> #include <kmessagebox.h> @@ -38,18 +38,18 @@ CodeGenerationWizard::CodeGenerationWizard(UMLClassifierList *classList) - : CodeGenerationWizardBase((QWidget*)UMLApp::app()) { + : CodeGenerationWizardBase((TQWidget*)UMLApp::app()) { m_doc = UMLApp::app()->getDocument(); m_app = UMLApp::app(); m_availableList -> setAllColumnsShowFocus(true); - m_availableList -> setResizeMode(QListView::AllColumns); + m_availableList -> setResizeMode(TQListView::AllColumns); m_selectedList -> setAllColumnsShowFocus(true); - m_selectedList -> setResizeMode(QListView::AllColumns); + m_selectedList -> setResizeMode(TQListView::AllColumns); m_statusList -> setAllColumnsShowFocus(true); - m_statusList -> setResizeMode(QListView::AllColumns); + m_statusList -> setResizeMode(TQListView::AllColumns); m_CodeGenerationOptionsPage = new CodeGenerationOptionsPage(this); - connect( m_CodeGenerationOptionsPage, SIGNAL(languageChanged()), this, SLOT(changeLanguage()) ); + connect( m_CodeGenerationOptionsPage, TQT_SIGNAL(languageChanged()), this, TQT_SLOT(changeLanguage()) ); insertPage(m_CodeGenerationOptionsPage, i18n("Code Generation Options"), 1); @@ -60,7 +60,7 @@ CodeGenerationWizard::CodeGenerationWizard(UMLClassifierList *classList) classList = &cList; } for (UMLClassifier *c = classList->first(); c ; c = classList->next()) { - new QListViewItem( m_selectedList, c->getFullyQualifiedName()); + new TQListViewItem( m_selectedList, c->getFullyQualifiedName()); } setNextEnabled(page(0),m_selectedList->childCount() > 0); @@ -68,10 +68,10 @@ CodeGenerationWizard::CodeGenerationWizard(UMLClassifierList *classList) setFinishEnabled(page(2),true); finishButton()->disconnect(); finishButton()->setText(i18n("&Generate")); - connect(finishButton(),SIGNAL(clicked()),this,SLOT(generateCode())); - if ( QApplication::reverseLayout() ) + connect(finishButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(generateCode())); + if ( TQApplication::reverseLayout() ) { - QPixmap tmpPixmap( *m_addButton->pixmap() ); + TQPixmap tmpPixmap( *m_addButton->pixmap() ); m_addButton->setPixmap(*m_removeButton->pixmap()); m_removeButton->setPixmap(tmpPixmap); } @@ -105,13 +105,13 @@ void CodeGenerationWizard::generateCode() { cancelButton()->setEnabled(false); - connect( codeGenerator, SIGNAL(codeGenerated(UMLClassifier*, bool)), - this, SLOT(classGenerated(UMLClassifier*, bool)) ); + connect( codeGenerator, TQT_SIGNAL(codeGenerated(UMLClassifier*, bool)), + this, TQT_SLOT(classGenerated(UMLClassifier*, bool)) ); UMLClassifierList cList; cList.setAutoDelete(false); - for(QListViewItem *item = m_statusList->firstChild(); item; + for(TQListViewItem *item = m_statusList->firstChild(); item; item = item-> nextSibling()) { UMLClassifier *concept = m_doc->findUMLClassifier(item->text(0)); cList.append(concept); @@ -119,13 +119,13 @@ void CodeGenerationWizard::generateCode() { codeGenerator->writeCodeToFile(cList); finishButton()->setText(i18n("Finish")); finishButton()->disconnect(); - connect(finishButton(),SIGNAL(clicked()),this,SLOT(accept())); + connect(finishButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(accept())); } } void CodeGenerationWizard::classGenerated(UMLClassifier* concept, bool generated) { - QListViewItem* item = m_statusList->findItem( concept->getFullyQualifiedName(), 0 ); + TQListViewItem* item = m_statusList->findItem( concept->getFullyQualifiedName(), 0 ); if( !item ) { kError()<<"GenerationStatusPage::Error finding class in list view"<<endl; } else if (generated) { @@ -137,16 +137,16 @@ void CodeGenerationWizard::classGenerated(UMLClassifier* concept, bool generated void CodeGenerationWizard::populateStatusList() { m_statusList->clear(); - for(QListViewItem* item = m_selectedList->firstChild(); item; item = item->nextSibling()) { - new QListViewItem(m_statusList,item->text(0),i18n("Not Yet Generated")); + for(TQListViewItem* item = m_selectedList->firstChild(); item; item = item->nextSibling()) { + new TQListViewItem(m_statusList,item->text(0),i18n("Not Yet Generated")); } } -void CodeGenerationWizard::showPage(QWidget *page) { +void CodeGenerationWizard::showPage(TQWidget *page) { if (indexOf(page) == 2) { // first save the settings to the selected generator policy - ((CodeGenerationOptionsPage*)QWizard::page(1))->apply(); + ((CodeGenerationOptionsPage*)TQWizard::page(1))->apply(); // before going on to the final page, check that the output directory exists and is // writable @@ -155,14 +155,14 @@ void CodeGenerationWizard::showPage(QWidget *page) { CodeGenerationPolicy *policy = UMLApp::app()->getCommonPolicy(); // get the output directory path - QFileInfo info(policy->getOutputDirectory().absPath()); + TQFileInfo info(policy->getOutputDirectory().absPath()); if(!info.exists()) { if (KMessageBox::questionYesNo(this, i18n("The folder %1 does not exist. Do you want to create it now?").arg(info.filePath()), i18n("Output Folder Does Not Exist"), i18n("Create Folder"), i18n("Do Not Create")) == KMessageBox::Yes) { - QDir dir; + TQDir dir; if(!dir.mkdir(info.filePath())) { KMessageBox::sorry(this,i18n("The folder could not be created.\nPlease make sure you have write access to its parent folder or select another, valid, folder."), @@ -195,7 +195,7 @@ void CodeGenerationWizard::showPage(QWidget *page) { } } populateStatusList(); - QWizard::showPage(page); + TQWizard::showPage(page); } CodeGenerator* CodeGenerationWizard::generator() { @@ -213,7 +213,7 @@ CodeGenerator* CodeGenerationWizard::generator() { return 0; } - QObject* o=fact->create(m_doc, 0, info->object.latin1()); + TQObject* o=fact->create(m_doc, 0, info->object.latin1()); if(!o) { kDebug()<<"could not create object"<<endl; return 0; @@ -226,14 +226,14 @@ CodeGenerator* CodeGenerationWizard::generator() { return (CodeGenerator*) NULL; } -void CodeGenerationWizard::moveSelectedItems(QListView* fromList, QListView* toList) { - QListViewItemIterator it(fromList, QListViewItemIterator::Selected); +void CodeGenerationWizard::moveSelectedItems(TQListView* fromList, TQListView* toList) { + TQListViewItemIterator it(fromList, TQListViewItemIterator::Selected); while (it.current()) { - QListViewItem* selectedItem = it.current(); + TQListViewItem* selectedItem = it.current(); - QString name = selectedItem->text(0); + TQString name = selectedItem->text(0); if (!toList->findItem(name, 0)) { - new QListViewItem(toList, name); + new TQListViewItem(toList, name); } ++it; diff --git a/umbrello/umbrello/dialogs/codegenerationwizard.h b/umbrello/umbrello/dialogs/codegenerationwizard.h index 14d5f157..2fec8046 100644 --- a/umbrello/umbrello/dialogs/codegenerationwizard.h +++ b/umbrello/umbrello/dialogs/codegenerationwizard.h @@ -21,8 +21,8 @@ #ifndef CODEGENERATIONWIZARD_H #define CODEGENERATIONWIZARD_H -#include <qwidget.h> -#include <qptrlist.h> +#include <tqwidget.h> +#include <tqptrlist.h> #include "codegenerationwizardbase.h" #include "settingsdlg.h" #include "../umlclassifierlist.h" @@ -43,10 +43,10 @@ public: CodeGenerationWizard(UMLClassifierList *classList); ~CodeGenerationWizard(); - void showPage(QWidget *); + void showPage(TQWidget *); int exec() { - return QWizard::exec(); + return TQWizard::exec(); } protected slots: @@ -78,7 +78,7 @@ private: * second. An item is added to the second list only if it isn't already * there (no duplicated items are created). */ - void moveSelectedItems(QListView* fromList, QListView* toList); + void moveSelectedItems(TQListView* fromList, TQListView* toList); UMLApp* m_app; UMLDoc* m_doc; diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.cpp b/umbrello/umbrello/dialogs/codeviewerdialog.cpp index 5672e576..479fcb6b 100644 --- a/umbrello/umbrello/dialogs/codeviewerdialog.cpp +++ b/umbrello/umbrello/dialogs/codeviewerdialog.cpp @@ -19,9 +19,9 @@ #include "codeviewerdialog.h" // qt/kde includes -#include <qlayout.h> -#include <qtabwidget.h> -#include <qcheckbox.h> +#include <tqlayout.h> +#include <tqtabwidget.h> +#include <tqcheckbox.h> #include <kdebug.h> #include <klocale.h> @@ -30,7 +30,7 @@ #include "../classifiercodedocument.h" #include "codeeditor.h" -CodeViewerDialog::CodeViewerDialog ( QWidget* parent, CodeDocument * doc, +CodeViewerDialog::CodeViewerDialog ( TQWidget* parent, CodeDocument * doc, Settings::CodeViewerState state, const char* name, bool modal, WFlags fl ) : CodeViewerDialogBase ( parent, name, modal, fl ) @@ -69,7 +69,7 @@ void CodeViewerDialog::initGUI ( const char * name) { CodeViewerDialogBaseLayout->setMargin(margin); - resize( QSize(width, height).expandedTo(minimumSizeHint()) ); + resize( TQSize(width, height).expandedTo(minimumSizeHint()) ); } @@ -79,12 +79,12 @@ void CodeViewerDialog::initGUI ( const char * name) { void CodeViewerDialog::addCodeDocument( CodeDocument * doc) { CodeEditor * page = new CodeEditor ( this, "_codedocumenteditor_", doc ); - QString fname = doc->getFileName(); - QString ext = doc->getFileExtension(); + TQString fname = doc->getFileName(); + TQString ext = doc->getFileExtension(); m_tabWidget->insertTab(page, (fname + (ext.isEmpty()? "" : ext))); - connect( m_highlightCheckBox, SIGNAL( stateChanged(int) ), page, SLOT( changeHighlighting(int) ) ); - connect( m_showHiddenCodeCB, SIGNAL( stateChanged(int) ), page, SLOT( changeShowHidden(int) ) ); + connect( m_highlightCheckBox, TQT_SIGNAL( stateChanged(int) ), page, TQT_SLOT( changeHighlighting(int) ) ); + connect( m_showHiddenCodeCB, TQT_SIGNAL( stateChanged(int) ), page, TQT_SLOT( changeShowHidden(int) ) ); } diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.h b/umbrello/umbrello/dialogs/codeviewerdialog.h index 7315384f..5367ef16 100644 --- a/umbrello/umbrello/dialogs/codeviewerdialog.h +++ b/umbrello/umbrello/dialogs/codeviewerdialog.h @@ -19,11 +19,11 @@ #ifndef CODEVIEWERDIALOG_H #define CODEVIEWERDIALOG_H -#include <qcolor.h> -#include <qmap.h> -#include <qptrlist.h> -#include <qstring.h> -#include <qtextedit.h> +#include <tqcolor.h> +#include <tqmap.h> +#include <tqptrlist.h> +#include <tqstring.h> +#include <tqtextedit.h> #include "../codeviewerstate.h" #include "codeviewerdialogbase.h" @@ -44,14 +44,14 @@ class CodeViewerDialog : public CodeViewerDialogBase Q_OBJECT public: - CodeViewerDialog ( QWidget* parent, CodeDocument * doc, Settings::CodeViewerState state, + CodeViewerDialog ( TQWidget* parent, CodeDocument * doc, Settings::CodeViewerState state, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~CodeViewerDialog (); /** return the code viewer state */ Settings::CodeViewerState getState( ); - QString parentDocName; + TQString parentDocName; /** * Adds a code document to the tabbed output diff --git a/umbrello/umbrello/dialogs/codevieweroptionspage.cpp b/umbrello/umbrello/dialogs/codevieweroptionspage.cpp index dd120569..f4715b0d 100644 --- a/umbrello/umbrello/dialogs/codevieweroptionspage.cpp +++ b/umbrello/umbrello/dialogs/codevieweroptionspage.cpp @@ -26,7 +26,7 @@ #include <kcolorbutton.h> -CodeViewerOptionsPage::CodeViewerOptionsPage( Settings::CodeViewerState options, QWidget *parent, const char *name ) +CodeViewerOptionsPage::CodeViewerOptionsPage( Settings::CodeViewerState options, TQWidget *parent, const char *name ) :CodeViewerOptionsBase(parent,name) { init (options); diff --git a/umbrello/umbrello/dialogs/codevieweroptionspage.h b/umbrello/umbrello/dialogs/codevieweroptionspage.h index ec01f170..fae3cb05 100644 --- a/umbrello/umbrello/dialogs/codevieweroptionspage.h +++ b/umbrello/umbrello/dialogs/codevieweroptionspage.h @@ -18,7 +18,7 @@ #ifndef CODEVIEWEROPTIONSPAGE_H #define CODEVIEWEROPTIONSPAGE_H -#include <qwidget.h> +#include <tqwidget.h> #include "codevieweroptionsbase.h" #include "../codeviewerstate.h" @@ -29,7 +29,7 @@ class CodeViewerOptionsPage : public CodeViewerOptionsBase { Q_OBJECT public: - CodeViewerOptionsPage (Settings::CodeViewerState options, QWidget *parent, const char *name=0); + CodeViewerOptionsPage (Settings::CodeViewerState options, TQWidget *parent, const char *name=0); ~CodeViewerOptionsPage(); Settings::CodeViewerState getOptions(); diff --git a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp index 668d732d..3da163b7 100644 --- a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp +++ b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp @@ -22,17 +22,17 @@ #include "defaultcodegenpolicypage.h" // qt/kde includes -#include <qlabel.h> +#include <tqlabel.h> #include <klocale.h> /** This is the page which comes up IF there is no special options for the * code generator. */ -DefaultCodeGenPolicyPage::DefaultCodeGenPolicyPage ( QWidget *parent, const char *name, CodeGenPolicyExt * policy ) +DefaultCodeGenPolicyPage::DefaultCodeGenPolicyPage ( TQWidget *parent, const char *name, CodeGenPolicyExt * policy ) :CodeGenerationPolicyPage(parent,name,policy) { - textLabel = new QLabel(parent,"textLabel"); + textLabel = new TQLabel(parent,"textLabel"); textLabel->setText(tr2i18n("<p align=\"center\">No Options Available.</p>")); } diff --git a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h index c3d36332..74592684 100644 --- a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h +++ b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h @@ -11,8 +11,8 @@ #ifndef DEFAULTCODEGENPOLICYPAGE_H #define DEFAULTCODEGENPOLICYPAGE_H -#include <qvariant.h> -#include <qwidget.h> +#include <tqvariant.h> +#include <tqwidget.h> #include "codegenerationpolicypage.h" class QVBoxLayout; @@ -27,11 +27,11 @@ class DefaultCodeGenPolicyPage : public CodeGenerationPolicyPage public: - explicit DefaultCodeGenPolicyPage( QWidget* parent = 0, const char* name = 0, CodeGenPolicyExt * policy =0); + explicit DefaultCodeGenPolicyPage( TQWidget* parent = 0, const char* name = 0, CodeGenPolicyExt * policy =0); ~DefaultCodeGenPolicyPage(); - QLabel* textLabel; + TQLabel* textLabel; protected: diff --git a/umbrello/umbrello/dialogs/diagramprintpage.cpp b/umbrello/umbrello/dialogs/diagramprintpage.cpp index cf366197..8374def4 100644 --- a/umbrello/umbrello/dialogs/diagramprintpage.cpp +++ b/umbrello/umbrello/dialogs/diagramprintpage.cpp @@ -13,13 +13,13 @@ #include "diagramprintpage.h" // qt/kde includes -#include <qlayout.h> -#include <qptrlist.h> -#include <qlistbox.h> -#include <qradiobutton.h> -#include <qcombobox.h> -#include <qbuttongroup.h> -#include <qgroupbox.h> +#include <tqlayout.h> +#include <tqptrlist.h> +#include <tqlistbox.h> +#include <tqradiobutton.h> +#include <tqcombobox.h> +#include <tqbuttongroup.h> +#include <tqgroupbox.h> #include <klocale.h> // local includes @@ -30,53 +30,53 @@ #include "../umlnamespace.h" -DiagramPrintPage::DiagramPrintPage(QWidget * parent, UMLDoc * m_pDoc) : KPrintDialogPage(parent), m_pDoc(m_pDoc) { +DiagramPrintPage::DiagramPrintPage(TQWidget * parent, UMLDoc * m_pDoc) : KPrintDialogPage(parent), m_pDoc(m_pDoc) { int margin = fontMetrics().height(); setTitle(i18n("&Diagrams")); - QHBoxLayout * mainLayout = new QHBoxLayout(this); + TQHBoxLayout * mainLayout = new TQHBoxLayout(this); mainLayout -> setSpacing(10); mainLayout -> setMargin(margin); - m_pFilterBG = new QButtonGroup(i18n("Filter"), this); + m_pFilterBG = new TQButtonGroup(i18n("Filter"), this); mainLayout -> addWidget(m_pFilterBG); m_pFilterBG -> setExclusive(true); - QVBoxLayout * filter = new QVBoxLayout(m_pFilterBG); + TQVBoxLayout * filter = new TQVBoxLayout(m_pFilterBG); filter -> setSpacing(10); filter-> setMargin(margin); - m_pCurrentRB = new QRadioButton(i18n("&Current diagram"), m_pFilterBG); + m_pCurrentRB = new TQRadioButton(i18n("&Current diagram"), m_pFilterBG); filter -> addWidget(m_pCurrentRB); m_pCurrentRB -> setChecked(true); m_pFilterBG -> insert(m_pCurrentRB, Current); - m_pAllRB = new QRadioButton(i18n("&All diagrams"), m_pFilterBG); + m_pAllRB = new TQRadioButton(i18n("&All diagrams"), m_pFilterBG); filter -> addWidget(m_pAllRB); m_pFilterBG -> insert(m_pAllRB, All); - m_pSelectRB = new QRadioButton(i18n("&Select diagrams"), m_pFilterBG); + m_pSelectRB = new TQRadioButton(i18n("&Select diagrams"), m_pFilterBG); filter -> addWidget(m_pSelectRB); m_pFilterBG -> insert(m_pSelectRB, Select); - m_pTypeRB = new QRadioButton(i18n("&Type of diagram"), m_pFilterBG); + m_pTypeRB = new TQRadioButton(i18n("&Type of diagram"), m_pFilterBG); filter -> addWidget(m_pTypeRB); m_pFilterBG -> insert(m_pTypeRB, Type); - m_pSelectGB = new QGroupBox(i18n("Selection"), this); + m_pSelectGB = new TQGroupBox(i18n("Selection"), this); mainLayout -> addWidget(m_pSelectGB); - QVBoxLayout * select = new QVBoxLayout(m_pSelectGB); + TQVBoxLayout * select = new TQVBoxLayout(m_pSelectGB); select -> setSpacing(10); select-> setMargin(margin); - m_pTypeCB = new QComboBox(m_pSelectGB); + m_pTypeCB = new TQComboBox(m_pSelectGB); select -> addWidget(m_pTypeCB); m_pTypeCB -> setEnabled(false); - m_pSelectLB = new QListBox(m_pSelectGB); + m_pSelectLB = new TQListBox(m_pSelectGB); select -> addWidget(m_pSelectLB); m_pSelectLB -> setEnabled(false); - m_pSelectLB -> setSelectionMode(QListBox::Multi); + m_pSelectLB -> setSelectionMode(TQListBox::Multi); m_pSelectLB -> insertItem(UMLApp::app()->getCurrentView()->getName()); m_pSelectLB -> setSelected(0, true); m_nIdList.clear(); @@ -85,8 +85,8 @@ DiagramPrintPage::DiagramPrintPage(QWidget * parent, UMLDoc * m_pDoc) : KPrintDi m_ViewType = Uml::dt_Class; - connect(m_pFilterBG, SIGNAL(clicked(int)), this, SLOT(slotClicked(int))); - connect(m_pTypeCB, SIGNAL(activated(const QString&)), this, SLOT(slotActivated(const QString&))); + connect(m_pFilterBG, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotClicked(int))); + connect(m_pTypeCB, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotActivated(const TQString&))); m_pTypeCB -> insertItem(i18n("Class")); m_pTypeCB -> insertItem(i18n("Use Case")); @@ -100,30 +100,30 @@ DiagramPrintPage::DiagramPrintPage(QWidget * parent, UMLDoc * m_pDoc) : KPrintDi DiagramPrintPage::~DiagramPrintPage() { - disconnect(m_pFilterBG, SIGNAL(clicked(int)), this, SLOT(slotClicked(int))); - disconnect(m_pTypeCB, SIGNAL(activated(const QString&)), this, SLOT(slotActivated(const QString&))); + disconnect(m_pFilterBG, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotClicked(int))); + disconnect(m_pTypeCB, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotActivated(const TQString&))); } -void DiagramPrintPage::getOptions( QMap<QString,QString>& opts, bool /*incldef = false*/ ) { +void DiagramPrintPage::getOptions( TQMap<TQString,TQString>& opts, bool /*incldef = false*/ ) { int listCount = m_pSelectLB -> count(); int count = 0; - QString diagram(i18n("kde-uml-Diagram")); + TQString diagram(i18n("kde-uml-Diagram")); for(int i=0;i<listCount;i++) { if(m_pSelectLB -> isSelected(i)) { UMLView *view = (UMLView *)m_pDoc -> findView(m_nIdList[i]); - QString sCount = QString("%1").arg(count); - QString sID = QString("%1").arg(ID2STR(view -> getID())); + TQString sCount = TQString("%1").arg(count); + TQString sID = TQString("%1").arg(ID2STR(view -> getID())); opts.insert(diagram + sCount, sID); count++; } } - opts.insert("kde-uml-count", QString("%1").arg(count)); + opts.insert("kde-uml-count", TQString("%1").arg(count)); } -void DiagramPrintPage::setOptions( const QMap<QString,QString>& /*opts*/ ) {} +void DiagramPrintPage::setOptions( const TQMap<TQString,TQString>& /*opts*/ ) {} -bool DiagramPrintPage::isValid( QString& msg ) { +bool DiagramPrintPage::isValid( TQString& msg ) { int listCount = m_pSelectLB -> count(); bool sel = false; for(int i =0;i<listCount;i++) { @@ -139,7 +139,7 @@ bool DiagramPrintPage::isValid( QString& msg ) { void DiagramPrintPage::slotClicked(int id) { UMLViewList list = m_pDoc -> getViewIterator(); UMLView * view = 0; - QString type; + TQString type; // clear list with diagrams to print m_nIdList.clear(); @@ -191,7 +191,7 @@ void DiagramPrintPage::slotClicked(int id) { } } -void DiagramPrintPage::slotActivated(const QString & text) { +void DiagramPrintPage::slotActivated(const TQString & text) { UMLViewList list = m_pDoc -> getViewIterator(); UMLView * view = 0; diff --git a/umbrello/umbrello/dialogs/diagramprintpage.h b/umbrello/umbrello/dialogs/diagramprintpage.h index f2184a27..7321f1bf 100644 --- a/umbrello/umbrello/dialogs/diagramprintpage.h +++ b/umbrello/umbrello/dialogs/diagramprintpage.h @@ -43,7 +43,7 @@ public: * @param parent The parent to the page. * @param doc The @ref UMLDoc class instance being used. */ - DiagramPrintPage(QWidget * parent, UMLDoc *doc); + DiagramPrintPage(TQWidget * parent, UMLDoc *doc); /** * Stnadard deconstructor. @@ -54,24 +54,24 @@ public: * Overriden method. It builds a list with the diagram name and the diagram * IDs. */ - void getOptions(QMap<QString,QString>& opts, bool /* incldef=false */); + void getOptions(TQMap<TQString,TQString>& opts, bool /* incldef=false */); /** * Overriden method. */ - void setOptions( const QMap<QString,QString>& /*opts*/ ); + void setOptions( const TQMap<TQString,TQString>& /*opts*/ ); /** * Overriden method. */ - bool isValid( QString& msg ); + bool isValid( TQString& msg ); private: - QButtonGroup * m_pFilterBG; - QGroupBox * m_pSelectGB; - QListBox * m_pSelectLB; - QRadioButton * m_pAllRB, * m_pCurrentRB, * m_pSelectRB, * m_pTypeRB; - QComboBox * m_pTypeCB; + TQButtonGroup * m_pFilterBG; + TQGroupBox * m_pSelectGB; + TQListBox * m_pSelectLB; + TQRadioButton * m_pAllRB, * m_pCurrentRB, * m_pSelectRB, * m_pTypeRB; + TQComboBox * m_pTypeCB; UMLDoc * m_pDoc; Uml::Diagram_Type m_ViewType; @@ -79,7 +79,7 @@ private: /** * list containing the IDs of diagrams to print */ - QValueList<Uml::IDType> m_nIdList; + TQValueList<Uml::IDType> m_nIdList; enum FilterType{Current = 0, All, Select, Type}; public slots: @@ -95,7 +95,7 @@ public slots: * Gets called when the user chooses another diagram type. Only diagrams of * this type will be shown in the diagram box. */ - void slotActivated(const QString & text); + void slotActivated(const TQString & text); }; #endif diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp index 9f47afa5..b72901be 100644 --- a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp +++ b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp @@ -13,9 +13,9 @@ #include "exportallviewsdialog.h" // include files for Qt -#include <qlayout.h> -#include <qlabel.h> -#include <qtooltip.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqtooltip.h> // kde include files #include <kfilefiltercombo.h> @@ -25,15 +25,15 @@ #include "../umlviewimageexportermodel.h" ExportAllViewsDialog::ExportAllViewsDialog( - QWidget* parent /* = 0 */, + TQWidget* parent /* = 0 */, const char* name /* = 0 */, bool modal /* = false */, WFlags fl /* = 0*/, - const QString &defaultMimeType /*= "image/png"*/) + const TQString &defaultMimeType /*= "image/png"*/) : ExportAllViewsDialogBase(parent,name, modal,fl) { // create and initialize m_imageType m_imageType = new KFileFilterCombo(this, "m_imageType"); - m_imageType->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed, 0, 0, m_imageType->sizePolicy().hasHeightForWidth())); + m_imageType->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 0, m_imageType->sizePolicy().hasHeightForWidth())); m_imageType->setEditable(false); m_imageType->setMimeFilter(UMLViewImageExporterModel::supportedMimeTypes(), defaultMimeType); @@ -48,7 +48,7 @@ ExportAllViewsDialog::ExportAllViewsDialog( void ExportAllViewsDialog::languageChange() { ExportAllViewsDialogBase::languageChange(); - QToolTip::add(m_imageType, tr2i18n("The format that the images will be exported to")); + TQToolTip::add(m_imageType, tr2i18n("The format that the images will be exported to")); } #include "exportallviewsdialog.moc" diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.h b/umbrello/umbrello/dialogs/exportallviewsdialog.h index 37b0a2f3..793f69b9 100644 --- a/umbrello/umbrello/dialogs/exportallviewsdialog.h +++ b/umbrello/umbrello/dialogs/exportallviewsdialog.h @@ -41,11 +41,11 @@ public: * @param fl Window flags. * @param defaultMimeType The default mime type that appears in the mime types list. * - * @see QDialog::QDialog + * @see TQDialog::QDialog */ - explicit ExportAllViewsDialog(QWidget* parent = 0, const char* name = 0, + explicit ExportAllViewsDialog(TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0, - const QString& defaultMimeType = "image/png"); + const TQString& defaultMimeType = "image/png"); /** * Destructor for UMLViewImageExporterModel. diff --git a/umbrello/umbrello/dialogs/notedialog.cpp b/umbrello/umbrello/dialogs/notedialog.cpp index f310990d..effb585d 100644 --- a/umbrello/umbrello/dialogs/notedialog.cpp +++ b/umbrello/umbrello/dialogs/notedialog.cpp @@ -13,30 +13,30 @@ #include "notedialog.h" // qt/kde includes -#include <qlineedit.h> -#include <qgroupbox.h> -#include <qtextedit.h> -#include <qlayout.h> -#include <qlabel.h> +#include <tqlineedit.h> +#include <tqgroupbox.h> +#include <tqtextedit.h> +#include <tqlayout.h> +#include <tqlabel.h> #include <klocale.h> #include <kmessagebox.h> -NoteDialog::NoteDialog( QWidget * parent, NoteWidget * pNote ) : KDialogBase(Plain, i18n("Note Documentation"), Help | Ok | Cancel , Ok, parent, "_NOTEDIALOG_", true, true) { +NoteDialog::NoteDialog( TQWidget * parent, NoteWidget * pNote ) : KDialogBase(Plain, i18n("Note Documentation"), Help | Ok | Cancel , Ok, parent, "_NOTEDIALOG_", true, true) { m_pNoteWidget = pNote; int margin = fontMetrics().height(); - m_pDocGB = new QGroupBox(i18n("Documentation"), plainPage()); - QVBoxLayout * mainLayout = new QVBoxLayout(plainPage()); + m_pDocGB = new TQGroupBox(i18n("Documentation"), plainPage()); + TQVBoxLayout * mainLayout = new TQVBoxLayout(plainPage()); mainLayout -> addWidget(m_pDocGB); mainLayout -> setSpacing(10); mainLayout -> setMargin(margin); - QHBoxLayout * docLayout = new QHBoxLayout(m_pDocGB); + TQHBoxLayout * docLayout = new TQHBoxLayout(m_pDocGB); docLayout -> setSpacing(10); docLayout -> setMargin(margin); - m_pDocTE = new QTextEdit( m_pDocGB ); + m_pDocTE = new TQTextEdit( m_pDocGB ); m_pDocTE -> setFocus(); docLayout -> addWidget( m_pDocTE ); m_pDocTE -> setText( pNote -> getDoc() ); diff --git a/umbrello/umbrello/dialogs/notedialog.h b/umbrello/umbrello/dialogs/notedialog.h index 3efd1404..c9062ec7 100644 --- a/umbrello/umbrello/dialogs/notedialog.h +++ b/umbrello/umbrello/dialogs/notedialog.h @@ -32,7 +32,7 @@ public: /** * Constructs an NoteDialog. */ - NoteDialog( QWidget * parent, NoteWidget * pNote ); + NoteDialog( TQWidget * parent, NoteWidget * pNote ); /** * Standard deconstructor. @@ -43,8 +43,8 @@ public slots: void slotOk(); private: //GUI widgets - QGroupBox * m_pDocGB; - QTextEdit * m_pDocTE; + TQGroupBox * m_pDocGB; + TQTextEdit * m_pDocTE; /** * Note widget to show documentation for. diff --git a/umbrello/umbrello/dialogs/overwritedialogue.cpp b/umbrello/umbrello/dialogs/overwritedialogue.cpp index b7c4a4f4..c9cb8b92 100644 --- a/umbrello/umbrello/dialogs/overwritedialogue.cpp +++ b/umbrello/umbrello/dialogs/overwritedialogue.cpp @@ -13,25 +13,25 @@ #include "overwritedialogue.h" // qt/kde includes -#include <qcheckbox.h> -#include <qlayout.h> -#include <qlabel.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqlabel.h> #include <klocale.h> #include <kdebug.h> OverwriteDialogue::OverwriteDialogue( - const QString& fileName, - const QString& outputDirectory, - bool applyToAllRemaining, QWidget* parent, const char* name) : + const TQString& fileName, + const TQString& outputDirectory, + bool applyToAllRemaining, TQWidget* parent, const char* name) : KDialogBase(Plain, i18n("Destination File Already Exists"), Ok|Apply|Cancel, Yes, parent, name) { - QVBoxLayout* layout = new QVBoxLayout( plainPage(), 0, spacingHint() ); + TQVBoxLayout* layout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); - QLabel* dialogueLabel = new QLabel(i18n("The file %1 already exists in %2.\n\nUmbrello can overwrite the file, generate a similar\nfile name or not generate this file.").arg(fileName).arg(outputDirectory), plainPage() ); + TQLabel* dialogueLabel = new TQLabel(i18n("The file %1 already exists in %2.\n\nUmbrello can overwrite the file, generate a similar\nfile name or not generate this file.").arg(fileName).arg(outputDirectory), plainPage() ); layout->addWidget(dialogueLabel); - m_applyToAllRemaining = new QCheckBox( i18n("&Apply to all remaining files"), plainPage() ); + m_applyToAllRemaining = new TQCheckBox( i18n("&Apply to all remaining files"), plainPage() ); m_applyToAllRemaining->setChecked(applyToAllRemaining); layout->addWidget(m_applyToAllRemaining); diff --git a/umbrello/umbrello/dialogs/overwritedialogue.h b/umbrello/umbrello/dialogs/overwritedialogue.h index a01e3366..36691466 100644 --- a/umbrello/umbrello/dialogs/overwritedialogue.h +++ b/umbrello/umbrello/dialogs/overwritedialogue.h @@ -34,8 +34,8 @@ public: /** * constructor sets up the dialog, adding checkbox and label */ - OverwriteDialogue(const QString& fileName, const QString& outputDirectory, - bool applyToAllRemaining, QWidget* parent=0, const char* name=0); + OverwriteDialogue(const TQString& fileName, const TQString& outputDirectory, + bool applyToAllRemaining, TQWidget* parent=0, const char* name=0); /** * destrictor doesn't do anything @@ -49,24 +49,24 @@ public: protected slots: /** - * Overrides standard operation to call QDialog::done(Yes). + * Overrides standard operation to call TQDialog::done(Yes). * This is a kludge, see note in class description. */ virtual void slotOk(); /** - * Overrides standard operation to call QDialog::done(No). + * Overrides standard operation to call TQDialog::done(No). */ virtual void slotApply(); /** - * Overrides standard operation to call QDialog::done(Cancel). + * Overrides standard operation to call TQDialog::done(Cancel). */ virtual void slotCancel(); private: - QCheckBox* m_applyToAllRemaining; + TQCheckBox* m_applyToAllRemaining; }; #endif diff --git a/umbrello/umbrello/dialogs/parmpropdlg.cpp b/umbrello/umbrello/dialogs/parmpropdlg.cpp index e8ddc245..38a75292 100644 --- a/umbrello/umbrello/dialogs/parmpropdlg.cpp +++ b/umbrello/umbrello/dialogs/parmpropdlg.cpp @@ -13,8 +13,8 @@ #include "parmpropdlg.h" // qt includes -#include <qlayout.h> -#include <qtooltip.h> +#include <tqlayout.h> +#include <tqtooltip.h> // kde includes #include <klocale.h> @@ -31,12 +31,12 @@ #include "parmpropdlg.moc" -ParmPropDlg::ParmPropDlg(QWidget * parent, UMLDoc * doc, UMLAttribute * a) +ParmPropDlg::ParmPropDlg(TQWidget * parent, UMLDoc * doc, UMLAttribute * a) : KDialogBase(Plain, i18n("Parameter Properties"), Help | Ok | Cancel , Ok, parent, "_PARMPROPDLG_", true, true) { m_pUmldoc = doc; m_pAtt = a; - QString type, text, name, initialValue; + TQString type, text, name, initialValue; if(!a) { type = text = name = initialValue = ""; } else { @@ -48,18 +48,18 @@ ParmPropDlg::ParmPropDlg(QWidget * parent, UMLDoc * doc, UMLAttribute * a) int margin = fontMetrics().height(); setMinimumSize(300, 400); //disableResize(); - QVBoxLayout * topLayout = new QVBoxLayout(plainPage()); + TQVBoxLayout * topLayout = new TQVBoxLayout(plainPage()); topLayout -> setSpacing(10); topLayout -> setMargin(margin); - m_pParmGB = new QGroupBox(i18n("Properties"), plainPage()); + m_pParmGB = new TQGroupBox(i18n("Properties"), plainPage()); topLayout -> addWidget(m_pParmGB); - QGridLayout * propLayout = new QGridLayout(m_pParmGB, 4, 2); + TQGridLayout * propLayout = new TQGridLayout(m_pParmGB, 4, 2); propLayout -> setSpacing(10); propLayout -> setMargin(margin); - m_pTypeL = new QLabel(i18n("&Type:"), m_pParmGB); + m_pTypeL = new TQLabel(i18n("&Type:"), m_pParmGB); propLayout -> addWidget(m_pTypeL, 0, 0); m_pTypeCB = new KComboBox(m_pParmGB); @@ -74,36 +74,36 @@ ParmPropDlg::ParmPropDlg(QWidget * parent, UMLDoc * doc, UMLAttribute * a) m_pInitialL, i18n("&Initial value:"), m_pInitialLE, initialValue ); - m_pStereoTypeL = new QLabel( i18n("Stereotype name:"), m_pParmGB ); + m_pStereoTypeL = new TQLabel( i18n("Stereotype name:"), m_pParmGB ); propLayout -> addWidget(m_pStereoTypeL, 3, 0); m_pStereoTypeCB = new KComboBox(true, m_pParmGB ); propLayout -> addWidget(m_pStereoTypeCB, 3, 1); - m_pKind = new QButtonGroup(i18n("Passing Direction"), plainPage()); + m_pKind = new TQButtonGroup(i18n("Passing Direction"), plainPage()); m_pKind->setExclusive(true); - QToolTip::add(m_pKind, i18n("\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" is a parameter for reading and writing.")); + TQToolTip::add(m_pKind, i18n("\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" is a parameter for reading and writing.")); - QHBoxLayout * kindLayout = new QHBoxLayout( m_pKind ); + TQHBoxLayout * kindLayout = new TQHBoxLayout( m_pKind ); kindLayout->setMargin(margin); - m_pIn = new QRadioButton( "in", m_pKind ); + m_pIn = new TQRadioButton( "in", m_pKind ); kindLayout->addWidget( m_pIn ); - m_pInOut = new QRadioButton( "inout", m_pKind ); + m_pInOut = new TQRadioButton( "inout", m_pKind ); kindLayout->addWidget( m_pInOut ); - m_pOut = new QRadioButton( "out", m_pKind ); + m_pOut = new TQRadioButton( "out", m_pKind ); kindLayout->addWidget( m_pOut ); topLayout -> addWidget(m_pKind); - m_pDocGB = new QGroupBox(i18n("Documentation"), plainPage()); - QHBoxLayout * docLayout = new QHBoxLayout(m_pDocGB); + m_pDocGB = new TQGroupBox(i18n("Documentation"), plainPage()); + TQHBoxLayout * docLayout = new TQHBoxLayout(m_pDocGB); docLayout -> setMargin(margin); - m_pDoc = new QMultiLineEdit(m_pDocGB); + m_pDoc = new TQMultiLineEdit(m_pDocGB); /////////// - m_pDoc->setWordWrap(QMultiLineEdit::WidgetWidth); + m_pDoc->setWordWrap(TQMultiLineEdit::WidgetWidth); ////////// m_pDoc -> setText(text); docLayout -> addWidget(m_pDoc); @@ -147,7 +147,7 @@ ParmPropDlg::ParmPropDlg(QWidget * parent, UMLDoc * doc, UMLAttribute * a) int typeBoxCount = 0; bool foundType = false; while (typeBoxCount < m_pTypeCB->count() && foundType == false) { - QString typeBoxString = m_pTypeCB->text(typeBoxCount); + TQString typeBoxString = m_pTypeCB->text(typeBoxCount); if ( typeBoxString == type ) { //getTypeName() foundType = true; m_pTypeCB->setCurrentItem(typeBoxCount); @@ -164,7 +164,7 @@ ParmPropDlg::ParmPropDlg(QWidget * parent, UMLDoc * doc, UMLAttribute * a) // manage stereotypes m_pStereoTypeCB->setDuplicatesEnabled(false); //only allow one of each type in box m_pStereoTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup ); - insertStereotype (QString("")); // an empty stereotype is the default + insertStereotype (TQString("")); // an empty stereotype is the default int defaultStereotype=0; bool foundDefaultStereotype = false; for (UMLStereotypeListIt it(m_pUmldoc->getStereotypes()); it.current(); ++it) { @@ -193,13 +193,13 @@ ParmPropDlg::ParmPropDlg(QWidget * parent, UMLDoc * doc, UMLAttribute * a) m_pNameLE->setFocus(); } -void ParmPropDlg::insertType( const QString& type, int index ) +void ParmPropDlg::insertType( const TQString& type, int index ) { m_pTypeCB->insertItem( type, index ); m_pTypeCB->completionObject()->addItem( type ); } -void ParmPropDlg::insertStereotype( const QString& type, int index ) +void ParmPropDlg::insertStereotype( const TQString& type, int index ) { m_pStereoTypeCB->insertItem( type, index ); m_pStereoTypeCB->completionObject()->addItem( type ); @@ -218,7 +218,7 @@ void ParmPropDlg::slotOk() { if (m_pAtt != NULL) { m_pAtt->setParmKind( getParmKind() ); m_pAtt->setStereotype( m_pStereoTypeCB->currentText() ); - QString typeName = m_pTypeCB->currentText(); + TQString typeName = m_pTypeCB->currentText(); UMLClassifier * pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->parent()->parent() ); if (pConcept == NULL) { kError() << "ParmPropDlg::slotOk: grandparent of " << m_pAtt->getName() diff --git a/umbrello/umbrello/dialogs/parmpropdlg.h b/umbrello/umbrello/dialogs/parmpropdlg.h index 25a6153a..b8efd75b 100644 --- a/umbrello/umbrello/dialogs/parmpropdlg.h +++ b/umbrello/umbrello/dialogs/parmpropdlg.h @@ -14,14 +14,14 @@ #include <kdialogbase.h> #include <kcombobox.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qradiobutton.h> -#include <qlineedit.h> -#include <qbuttongroup.h> -#include <qmultilineedit.h> -#include <qcombobox.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqradiobutton.h> +#include <tqlineedit.h> +#include <tqbuttongroup.h> +#include <tqmultilineedit.h> +#include <tqcombobox.h> #include "../attribute.h" class UMLDoc; @@ -44,7 +44,7 @@ public: * @param parent The parent of the dialog. * @param a The parameter to represent. */ - ParmPropDlg(QWidget * parent, UMLDoc * doc, UMLAttribute * a); + ParmPropDlg(TQWidget * parent, UMLDoc * doc, UMLAttribute * a); /** * Standard deconstructor. @@ -56,7 +56,7 @@ public: * * @return Returns the documentation. */ - QString getDoc() { + TQString getDoc() { return m_pDoc -> text(); } @@ -65,7 +65,7 @@ public: * * @return Return the name of the parameter. */ - QString getName() { + TQString getName() { return m_pNameLE -> text(); } @@ -74,7 +74,7 @@ public: * * @return Return the initial value of the parameter. */ - QString getInitialValue() { + TQString getInitialValue() { return m_pInitialLE -> text(); } @@ -83,7 +83,7 @@ public: * * @return Return the type name of the parameter. */ - QString getTypeName() { + TQString getTypeName() { return m_pTypeCB -> currentText(); } @@ -102,22 +102,22 @@ protected: /** * Inserts @p type into the type-combobox as well as its completion object. */ - void insertType( const QString& type, int index = -1 ); + void insertType( const TQString& type, int index = -1 ); /** * Inserts @p type into the stereotype-combobox as well as its completion object. */ - void insertStereotype( const QString& type, int index = -1 ); + void insertStereotype( const TQString& type, int index = -1 ); private: - QGroupBox * m_pParmGB, * m_pDocGB; - QButtonGroup *m_pKind; - QRadioButton * m_pIn, * m_pOut, *m_pInOut; - QLabel * m_pTypeL, * m_pNameL, * m_pInitialL, * m_pStereoTypeL; + TQGroupBox * m_pParmGB, * m_pDocGB; + TQButtonGroup *m_pKind; + TQRadioButton * m_pIn, * m_pOut, *m_pInOut; + TQLabel * m_pTypeL, * m_pNameL, * m_pInitialL, * m_pStereoTypeL; KComboBox * m_pTypeCB, * m_pStereoTypeCB; - QLineEdit * m_pNameLE, * m_pInitialLE; - QMultiLineEdit * m_pDoc; + TQLineEdit * m_pNameLE, * m_pInitialLE; + TQMultiLineEdit * m_pDoc; UMLDoc * m_pUmldoc; UMLAttribute * m_pAtt; }; diff --git a/umbrello/umbrello/dialogs/pkgcontentspage.cpp b/umbrello/umbrello/dialogs/pkgcontentspage.cpp index dd70f7fc..dce7c98b 100644 --- a/umbrello/umbrello/dialogs/pkgcontentspage.cpp +++ b/umbrello/umbrello/dialogs/pkgcontentspage.cpp @@ -10,57 +10,57 @@ ***************************************************************************/ #include "pkgcontentspage.h" -#include <qlayout.h> +#include <tqlayout.h> #include <klocale.h> #include "../umlobjectlist.h" #include "../uml.h" #include "../umldoc.h" #include "classpropdlg.h" -PkgContentsPage::PkgContentsPage(QWidget *parent, UMLPackage *pkg) - : QWidget(parent) +PkgContentsPage::PkgContentsPage(TQWidget *parent, UMLPackage *pkg) + : TQWidget(parent) { m_pPackage = pkg; int margin = fontMetrics().height(); - QHBoxLayout * mainLayout = new QHBoxLayout(this); + TQHBoxLayout * mainLayout = new TQHBoxLayout(this); mainLayout -> setSpacing(10); - m_pContentGB = new QGroupBox(i18n("Contained Items"), this); + m_pContentGB = new TQGroupBox(i18n("Contained Items"), this); mainLayout -> addWidget(m_pContentGB); - QHBoxLayout * layout = new QHBoxLayout(m_pContentGB); + TQHBoxLayout * layout = new TQHBoxLayout(m_pContentGB); layout -> setSpacing(10); layout -> setMargin(margin); - m_pContentLB = new QListBox(m_pContentGB); + m_pContentLB = new TQListBox(m_pContentGB); layout -> addWidget(m_pContentLB); setMinimumSize(310, 330); fillListBox(); m_pMenu = 0; - connect(m_pContentLB, SIGNAL(doubleClicked(QListBoxItem *)), - this, SLOT(slotDoubleClick(QListBoxItem *))); + connect(m_pContentLB, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), + this, TQT_SLOT(slotDoubleClick(TQListBoxItem *))); - connect(m_pContentLB, SIGNAL(rightButtonPressed(QListBoxItem *, const QPoint &)), - this, SLOT(slotRightButtonPressed(QListBoxItem *, const QPoint &))); + connect(m_pContentLB, TQT_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), + this, TQT_SLOT(slotRightButtonPressed(TQListBoxItem *, const TQPoint &))); - connect(m_pContentLB, SIGNAL(rightButtonClicked(QListBoxItem *, const QPoint &)), - this, SLOT(slotRightButtonClicked(QListBoxItem *, const QPoint &))); + connect(m_pContentLB, TQT_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), + this, TQT_SLOT(slotRightButtonClicked(TQListBoxItem *, const TQPoint &))); } PkgContentsPage::~PkgContentsPage() { - disconnect(m_pContentLB, SIGNAL(doubleClicked(QListBoxItem *)), - this, SLOT(slotDoubleClick(QListBoxItem *))); + disconnect(m_pContentLB, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), + this, TQT_SLOT(slotDoubleClick(TQListBoxItem *))); - disconnect(m_pContentLB, SIGNAL(rightButtonPressed(QListBoxItem *, const QPoint &)), - this, SLOT(slotRightButtonPressed(QListBoxItem *, const QPoint &))); + disconnect(m_pContentLB, TQT_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), + this, TQT_SLOT(slotRightButtonPressed(TQListBoxItem *, const TQPoint &))); - disconnect(m_pContentLB, SIGNAL(rightButtonClicked(QListBoxItem *, const QPoint &)), - this, SLOT(slotRightButtonClicked(QListBoxItem *, const QPoint &))); + disconnect(m_pContentLB, TQT_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), + this, TQT_SLOT(slotRightButtonClicked(TQListBoxItem *, const TQPoint &))); } -void PkgContentsPage::slotDoubleClick(QListBoxItem * i) { +void PkgContentsPage::slotDoubleClick(TQListBoxItem * i) { if (!i) return; int item = m_pContentLB -> currentItem(); @@ -82,27 +82,27 @@ void PkgContentsPage::fillListBox() { } } -void PkgContentsPage::slotRightButtonClicked(QListBoxItem */* item*/, const QPoint &/* p*/) { +void PkgContentsPage::slotRightButtonClicked(TQListBoxItem */* item*/, const TQPoint &/* p*/) { if(m_pMenu) { m_pMenu -> hide(); - disconnect(m_pMenu, SIGNAL(activated(int)), this, SLOT(slotPopupMenuSel(int))); + disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } } -void PkgContentsPage::slotRightButtonPressed(QListBoxItem * item, const QPoint & p) { +void PkgContentsPage::slotRightButtonPressed(TQListBoxItem * item, const TQPoint & p) { if(!item) return; if(m_pMenu) { m_pMenu -> hide(); - disconnect(m_pMenu, SIGNAL(activated(int)), this, SLOT(slotPopupMenuSel(int))); + disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } m_pMenu = new ListPopupMenu(this, ListPopupMenu::mt_Association_Selected); m_pMenu->popup(p); - connect(m_pMenu, SIGNAL(activated(int)), this, SLOT(slotPopupMenuSel(int))); + connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); } void PkgContentsPage::slotPopupMenuSel(int id) { diff --git a/umbrello/umbrello/dialogs/pkgcontentspage.h b/umbrello/umbrello/dialogs/pkgcontentspage.h index 8659e672..b95e5348 100644 --- a/umbrello/umbrello/dialogs/pkgcontentspage.h +++ b/umbrello/umbrello/dialogs/pkgcontentspage.h @@ -12,10 +12,10 @@ #ifndef PKGCONTENTSPAGE_H #define PKGCONTENTSPAGE_H -#include <qwidget.h> -#include <qgroupbox.h> -#include <qlistbox.h> -#include <qptrlist.h> +#include <tqwidget.h> +#include <tqgroupbox.h> +#include <tqlistbox.h> +#include <tqptrlist.h> #include "../package.h" #include "../listpopupmenu.h" @@ -25,7 +25,7 @@ * @author Oliver Kellogg <okellogg@users.sourceforge.net> * Bugs and comments to uml-devel@lists.sf.net or http://bugs.kde.org */ -class PkgContentsPage : public QWidget { +class PkgContentsPage : public TQWidget { Q_OBJECT public: /** @@ -34,7 +34,7 @@ public: * @param parent The parent of the page. * @param pkg The UMLPackage being represented. */ - PkgContentsPage(QWidget *parent, UMLPackage *pkg); + PkgContentsPage(TQWidget *parent, UMLPackage *pkg); /** * Standard destructor. @@ -43,8 +43,8 @@ public: private: UMLPackage * m_pPackage; - QListBox * m_pContentLB; - QGroupBox * m_pContentGB; + TQListBox * m_pContentLB; + TQGroupBox * m_pContentGB; ListPopupMenu * m_pMenu; /** @@ -53,9 +53,9 @@ private: void fillListBox(); public slots: - void slotDoubleClick(QListBoxItem * i); - void slotRightButtonClicked(QListBoxItem */* item*/, const QPoint &/* p*/); - void slotRightButtonPressed(QListBoxItem * item, const QPoint & p); + void slotDoubleClick(TQListBoxItem * i); + void slotRightButtonClicked(TQListBoxItem */* item*/, const TQPoint &/* p*/); + void slotRightButtonPressed(TQListBoxItem * item, const TQPoint & p); void slotPopupMenuSel(int id); }; diff --git a/umbrello/umbrello/dialogs/selectopdlg.cpp b/umbrello/umbrello/dialogs/selectopdlg.cpp index cb9e344d..1c175752 100644 --- a/umbrello/umbrello/dialogs/selectopdlg.cpp +++ b/umbrello/umbrello/dialogs/selectopdlg.cpp @@ -13,7 +13,7 @@ #include "selectopdlg.h" // qt includes -#include <qlayout.h> +#include <tqlayout.h> // kde includes #include <klocale.h> @@ -30,12 +30,12 @@ SelectOpDlg::SelectOpDlg(UMLView * parent, UMLClassifier * c) : KDialogBase(Plain, i18n("Select Operation"), Ok | Cancel , Ok, parent, "_SELOPDLG_", true, true) { m_pView = parent; - QVBoxLayout * topLayout = new QVBoxLayout(plainPage()); + TQVBoxLayout * topLayout = new TQVBoxLayout(plainPage()); - m_pOpGB = new QGroupBox(i18n("Select Operation"), plainPage()); + m_pOpGB = new TQGroupBox(i18n("Select Operation"), plainPage()); topLayout -> addWidget(m_pOpGB); - QGridLayout * mainLayout = new QGridLayout(m_pOpGB, 3, 2); + TQGridLayout * mainLayout = new TQGridLayout(m_pOpGB, 3, 2); mainLayout -> setSpacing(spacingHint()); mainLayout -> setMargin(fontMetrics().height()); @@ -43,7 +43,7 @@ SelectOpDlg::SelectOpDlg(UMLView * parent, UMLClassifier * c) m_pSeqL, i18n("Sequence number:"), m_pSeqLE ); - m_pOpRB = new QRadioButton(i18n("Class operation:"), m_pOpGB); + m_pOpRB = new TQRadioButton(i18n("Class operation:"), m_pOpGB); mainLayout -> addWidget(m_pOpRB, 1, 0); m_pOpCB = new KComboBox(m_pOpGB); @@ -51,13 +51,13 @@ SelectOpDlg::SelectOpDlg(UMLView * parent, UMLClassifier * c) m_pOpCB->setDuplicatesEnabled(false);//only allow one of each type in box mainLayout -> addWidget(m_pOpCB, 1, 1); - m_pCustomRB = new QRadioButton(i18n("Custom operation:"), m_pOpGB); + m_pCustomRB = new TQRadioButton(i18n("Custom operation:"), m_pOpGB); mainLayout -> addWidget(m_pCustomRB, 2, 0); - m_pOpLE = new QLineEdit(m_pOpGB); + m_pOpLE = new TQLineEdit(m_pOpGB); mainLayout -> addWidget(m_pOpLE, 2, 1); - m_pOpBG = new QButtonGroup(0); + m_pOpBG = new TQButtonGroup(0); m_pOpBG -> insert(m_pOpRB, OP); m_pOpBG -> insert(m_pCustomRB, CUSTOM); m_pOpBG -> setExclusive(true); @@ -68,23 +68,23 @@ SelectOpDlg::SelectOpDlg(UMLView * parent, UMLClassifier * c) insertOperation( obj->toString(Uml::st_SigNoVis) ); } //disableResize(); - connect(m_pOpBG, SIGNAL(clicked(int)), this, SLOT(slotSelected(int))); + connect(m_pOpBG, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotSelected(int))); m_nOpCount = c -> operations(); slotSelected(OP); } SelectOpDlg::~SelectOpDlg() { - disconnect(m_pOpBG, SIGNAL(clicked(int)), this, SLOT(slotSelected(int))); + disconnect(m_pOpBG, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotSelected(int))); delete m_pOpBG; } -void SelectOpDlg::insertOperation( const QString& type, int index ) +void SelectOpDlg::insertOperation( const TQString& type, int index ) { m_pOpCB->insertItem( type, index ); m_pOpCB->completionObject()->addItem( type ); } -QString SelectOpDlg::getOpText() { +TQString SelectOpDlg::getOpText() { if(m_pOpRB -> isChecked()) return m_pOpCB -> currentText(); else @@ -107,7 +107,7 @@ void SelectOpDlg::slotSelected(int id) { m_id = id; } -void SelectOpDlg::setCustomOp(const QString &op) { +void SelectOpDlg::setCustomOp(const TQString &op) { m_pOpLE -> setText(op); if(op.length() > 0) { slotSelected(CUSTOM); @@ -115,7 +115,7 @@ void SelectOpDlg::setCustomOp(const QString &op) { } } -bool SelectOpDlg::setClassOp(const QString &op) { +bool SelectOpDlg::setClassOp(const TQString &op) { for (int i = 1; i!= m_pOpCB->count(); ++i) { if ( m_pOpCB->text(i) == op ) { @@ -128,11 +128,11 @@ bool SelectOpDlg::setClassOp(const QString &op) { return false; } -QString SelectOpDlg::getSeqNumber() { +TQString SelectOpDlg::getSeqNumber() { return m_pSeqLE->text(); } -void SelectOpDlg::setSeqNumber(const QString &num) { +void SelectOpDlg::setSeqNumber(const TQString &num) { m_pSeqLE->setText(num); } diff --git a/umbrello/umbrello/dialogs/selectopdlg.h b/umbrello/umbrello/dialogs/selectopdlg.h index c5d8c93b..4bbcf52b 100644 --- a/umbrello/umbrello/dialogs/selectopdlg.h +++ b/umbrello/umbrello/dialogs/selectopdlg.h @@ -15,12 +15,12 @@ #include <kdialogbase.h> -#include <qgroupbox.h> +#include <tqgroupbox.h> #include <kcombobox.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> -#include <qlineedit.h> -#include <qlabel.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> +#include <tqlineedit.h> +#include <tqlabel.h> #include "../classifier.h" class UMLView; @@ -58,7 +58,7 @@ public: * * @return The operation to display. */ - QString getOpText(); + TQString getOpText(); /** * Return whether the user selected a class operation @@ -74,41 +74,41 @@ public: * * @return Returns the sequence number for the operation. */ - QString getSeqNumber(); + TQString getSeqNumber(); /** * Set the sequence number text. * * @param num The number to set the sequence to. */ - void setSeqNumber(const QString &num); + void setSeqNumber(const TQString &num); /** * Set the custom operation text. * * @param op The operation to set as the custom operation. */ - void setCustomOp(const QString &op); + void setCustomOp(const TQString &op); /** * Set the class operation text. * * @param op The operation to set as the class operation. * @return false if no such operation exists. */ - bool setClassOp(const QString &op); + bool setClassOp(const TQString &op); protected: /** * Inserts @p type into the type-combobox as well as its completion object. */ - void insertOperation( const QString& type, int index = -1 ); + void insertOperation( const TQString& type, int index = -1 ); private: - QGroupBox * m_pOpGB; + TQGroupBox * m_pOpGB; KComboBox * m_pOpCB; - QLabel * m_pSeqL; - QLineEdit * m_pOpLE, * m_pSeqLE; - QRadioButton * m_pCustomRB, * m_pOpRB; - QButtonGroup * m_pOpBG, * m_pDocGB; - QString m_Text; + TQLabel * m_pSeqL; + TQLineEdit * m_pOpLE, * m_pSeqLE; + TQRadioButton * m_pCustomRB, * m_pOpRB; + TQButtonGroup * m_pOpBG, * m_pDocGB; + TQString m_Text; int m_nOpCount; int m_id; ///< takes on the value OP or CUSTOM according to what the user selected UMLView *m_pView; diff --git a/umbrello/umbrello/dialogs/settingsdlg.cpp b/umbrello/umbrello/dialogs/settingsdlg.cpp index 2bfaaf29..59b9ff28 100644 --- a/umbrello/umbrello/dialogs/settingsdlg.cpp +++ b/umbrello/umbrello/dialogs/settingsdlg.cpp @@ -13,9 +13,9 @@ #include "settingsdlg.h" // qt includes -#include <qlayout.h> -#include <qtooltip.h> -#include <qvbox.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqvbox.h> // kde includes #include <kdebug.h> #include <kiconloader.h> @@ -26,12 +26,12 @@ #include "codevieweroptionspage.h" #include "../dialog_utils.h" -SettingsDlg::SettingsDlg( QWidget * parent, Settings::OptionState *state ) +SettingsDlg::SettingsDlg( TQWidget * parent, Settings::OptionState *state ) : KDialogBase( IconList, i18n("Umbrello Setup"), Help | Default | Apply | Ok | Cancel, Ok, parent, 0, true, true ) { m_bChangesApplied = false; m_pOptionState = state; - setHelp( "umbrello/index.html", QString::null ); + setHelp( "umbrello/index.html", TQString::null ); setupGeneralPage(); setupFontPage(); setupUIPage(); @@ -44,33 +44,33 @@ SettingsDlg::~SettingsDlg() {} void SettingsDlg::setupUIPage() { //setup UI page - QVBox * page = addVBoxPage( i18n("User Interface"), i18n("User Interface Settings"), DesktopIcon( "window_list") ); + TQVBox * page = addVBoxPage( i18n("User Interface"), i18n("User Interface Settings"), DesktopIcon( "window_list") ); - m_UiWidgets.colorGB = new QGroupBox( i18n("Color"), page ); - QGridLayout * colorLayout = new QGridLayout( m_UiWidgets.colorGB, 3, 3 ); + m_UiWidgets.colorGB = new TQGroupBox( i18n("Color"), page ); + TQGridLayout * colorLayout = new TQGridLayout( m_UiWidgets.colorGB, 3, 3 ); colorLayout -> setSpacing( spacingHint() ); colorLayout -> setMargin( fontMetrics().height() ); - m_UiWidgets.lineColorL = new QLabel( i18n("Line color:"), m_UiWidgets.colorGB ); + m_UiWidgets.lineColorL = new TQLabel( i18n("Line color:"), m_UiWidgets.colorGB ); colorLayout -> addWidget( m_UiWidgets.lineColorL, 0, 0 ); m_UiWidgets.lineColorB = new KColorButton( m_pOptionState->uiState.lineColor, m_UiWidgets.colorGB ); colorLayout -> addWidget( m_UiWidgets.lineColorB, 0, 1 ); - m_UiWidgets.lineDefaultB = new QPushButton( i18n("D&efault Color"), m_UiWidgets.colorGB ); + m_UiWidgets.lineDefaultB = new TQPushButton( i18n("D&efault Color"), m_UiWidgets.colorGB ); colorLayout -> addWidget( m_UiWidgets.lineDefaultB, 0, 2 ); - m_UiWidgets.fillColorL = new QLabel( i18n("Fill color:"), m_UiWidgets.colorGB ); + m_UiWidgets.fillColorL = new TQLabel( i18n("Fill color:"), m_UiWidgets.colorGB ); colorLayout -> addWidget( m_UiWidgets.fillColorL, 1, 0 ); m_UiWidgets.fillColorB = new KColorButton( m_pOptionState->uiState.fillColor, m_UiWidgets.colorGB ); colorLayout -> addWidget( m_UiWidgets.fillColorB, 1, 1 ); - m_UiWidgets.fillDefaultB = new QPushButton( i18n("De&fault Color"), m_UiWidgets.colorGB ); + m_UiWidgets.fillDefaultB = new TQPushButton( i18n("De&fault Color"), m_UiWidgets.colorGB ); colorLayout -> addWidget( m_UiWidgets.fillDefaultB, 1, 2 ); - m_UiWidgets.lineWidthL = new QLabel( i18n("Line width:"), m_UiWidgets.colorGB ); + m_UiWidgets.lineWidthL = new TQLabel( i18n("Line width:"), m_UiWidgets.colorGB ); colorLayout -> addWidget( m_UiWidgets.lineWidthL, 2, 0 ); // Low-Limit: 0, High-Limit: 10, Step: 1, Initial-Val: m_pOptionState->uiState.lineWidth @@ -78,62 +78,62 @@ void SettingsDlg::setupUIPage() { m_UiWidgets.lineWidthB = new KIntSpinBox( 0, 10, 1, m_pOptionState->uiState.lineWidth, 10, m_UiWidgets.colorGB ); colorLayout -> addWidget( m_UiWidgets.lineWidthB, 2, 1 ); - m_UiWidgets.lineWidthDefaultB = new QPushButton( i18n("D&efault Width"), m_UiWidgets.colorGB ); + m_UiWidgets.lineWidthDefaultB = new TQPushButton( i18n("D&efault Width"), m_UiWidgets.colorGB ); colorLayout -> addWidget( m_UiWidgets.lineWidthDefaultB, 2, 2 ); - m_UiWidgets.useFillColorCB = new QCheckBox( i18n("&Use fill color"), m_UiWidgets.colorGB ); + m_UiWidgets.useFillColorCB = new TQCheckBox( i18n("&Use fill color"), m_UiWidgets.colorGB ); colorLayout -> setRowStretch( 3, 2 ); colorLayout -> addWidget( m_UiWidgets.useFillColorCB, 3, 0 ); m_UiWidgets.useFillColorCB -> setChecked( m_pOptionState->uiState.useFillColor ); //connect button signals up - connect( m_UiWidgets.lineDefaultB, SIGNAL(clicked()), this, SLOT(slotLineBClicked()) ); - connect( m_UiWidgets.fillDefaultB, SIGNAL(clicked()), this, SLOT(slotFillBClicked()) ); + connect( m_UiWidgets.lineDefaultB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLineBClicked()) ); + connect( m_UiWidgets.fillDefaultB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFillBClicked()) ); } void SettingsDlg::setupGeneralPage() { //setup General page - QVBox * page = addVBoxPage( i18n("General"), i18n("General Settings"), DesktopIcon( "misc") ); + TQVBox * page = addVBoxPage( i18n("General"), i18n("General Settings"), DesktopIcon( "misc") ); // Set up undo setting - m_GeneralWidgets.miscGB = new QGroupBox( i18n("Miscellaneous"), page ); + m_GeneralWidgets.miscGB = new TQGroupBox( i18n("Miscellaneous"), page ); - QGridLayout * miscLayout = new QGridLayout( m_GeneralWidgets.miscGB, 2, 2 ); + TQGridLayout * miscLayout = new TQGridLayout( m_GeneralWidgets.miscGB, 2, 2 ); miscLayout -> setSpacing( spacingHint() ); miscLayout -> setMargin( fontMetrics().height() ); - m_GeneralWidgets.undoCB = new QCheckBox( i18n("Enable undo"), m_GeneralWidgets.miscGB ); + m_GeneralWidgets.undoCB = new TQCheckBox( i18n("Enable undo"), m_GeneralWidgets.miscGB ); m_GeneralWidgets.undoCB -> setChecked( m_pOptionState->generalState.undo ); miscLayout -> addWidget( m_GeneralWidgets.undoCB, 0, 0 ); - m_GeneralWidgets.tabdiagramsCB = new QCheckBox( i18n("Use tabbed diagrams"), m_GeneralWidgets.miscGB ); + m_GeneralWidgets.tabdiagramsCB = new TQCheckBox( i18n("Use tabbed diagrams"), m_GeneralWidgets.miscGB ); m_GeneralWidgets.tabdiagramsCB -> setChecked( m_pOptionState->generalState.tabdiagrams ); miscLayout -> addWidget( m_GeneralWidgets.tabdiagramsCB, 0, 1 ); - m_GeneralWidgets.newcodegenCB = new QCheckBox( i18n("Use new C++/Java/Ruby generators"), m_GeneralWidgets.miscGB ); + m_GeneralWidgets.newcodegenCB = new TQCheckBox( i18n("Use new C++/Java/Ruby generators"), m_GeneralWidgets.miscGB ); m_GeneralWidgets.newcodegenCB -> setChecked( m_pOptionState->generalState.newcodegen ); miscLayout -> addWidget( m_GeneralWidgets.newcodegenCB, 1, 0 ); - m_GeneralWidgets.angularLinesCB = new QCheckBox( i18n("Use angular association lines"), m_GeneralWidgets.miscGB ); + m_GeneralWidgets.angularLinesCB = new TQCheckBox( i18n("Use angular association lines"), m_GeneralWidgets.miscGB ); m_GeneralWidgets.angularLinesCB -> setChecked( m_pOptionState->generalState.angularlines ); miscLayout -> addWidget( m_GeneralWidgets.angularLinesCB, 1, 1 ); //setup autosave settings - m_GeneralWidgets.autosaveGB = new QGroupBox( i18n("Autosave"), page ); + m_GeneralWidgets.autosaveGB = new TQGroupBox( i18n("Autosave"), page ); - QGridLayout * autosaveLayout = new QGridLayout( m_GeneralWidgets.autosaveGB, 3, 2 ); + TQGridLayout * autosaveLayout = new TQGridLayout( m_GeneralWidgets.autosaveGB, 3, 2 ); autosaveLayout -> setSpacing( spacingHint() ); autosaveLayout -> setMargin( fontMetrics().height() ); - m_GeneralWidgets.autosaveCB = new QCheckBox( i18n("E&nable autosave"), m_GeneralWidgets.autosaveGB ); + m_GeneralWidgets.autosaveCB = new TQCheckBox( i18n("E&nable autosave"), m_GeneralWidgets.autosaveGB ); m_GeneralWidgets.autosaveCB -> setChecked( m_pOptionState->generalState.autosave ); autosaveLayout -> addWidget( m_GeneralWidgets.autosaveCB, 0, 0 ); - m_GeneralWidgets.autosaveL = new QLabel( i18n("Select auto-save time interval (mins):"), m_GeneralWidgets.autosaveGB ); + m_GeneralWidgets.autosaveL = new TQLabel( i18n("Select auto-save time interval (mins):"), m_GeneralWidgets.autosaveGB ); autosaveLayout -> addWidget( m_GeneralWidgets.autosaveL, 1, 0 ); m_GeneralWidgets.timeISB = new KIntSpinBox( 1, 600, 1, m_pOptionState->generalState.autosavetime, 10, m_GeneralWidgets.autosaveGB ); @@ -145,42 +145,42 @@ void SettingsDlg::setupGeneralPage() { Dialog_Utils::makeLabeledEditField( m_GeneralWidgets.autosaveGB, autosaveLayout, 2, m_GeneralWidgets.autosaveSuffixL, i18n("Set autosave suffix:"), m_GeneralWidgets.autosaveSuffixT, m_pOptionState->generalState.autosavesuffix ); - QString autoSaveSuffixToolTip = i18n( "<qt><p>The autosave file will be saved to ~/autosave.xmi if the autosaving occurs " + TQString autoSaveSuffixToolTip = i18n( "<qt><p>The autosave file will be saved to ~/autosave.xmi if the autosaving occurs " "before you have manually saved the file.</p>" "<p>If you've already saved it, the autosave file will be saved in the same folder as the file " "and will be named like the file's name, followed by the suffix specified.</p>" "<p>If the suffix is equal to the suffix of the file you've saved, " "the autosave will overwrite your file automatically.</p></qt>" ); - QToolTip::add( m_GeneralWidgets.autosaveSuffixL, autoSaveSuffixToolTip ); - QToolTip::add( m_GeneralWidgets.autosaveSuffixT, autoSaveSuffixToolTip ); + TQToolTip::add( m_GeneralWidgets.autosaveSuffixL, autoSaveSuffixToolTip ); + TQToolTip::add( m_GeneralWidgets.autosaveSuffixT, autoSaveSuffixToolTip ); //setup startup settings - m_GeneralWidgets.startupGB = new QGroupBox( i18n("Startup"), page ); + m_GeneralWidgets.startupGB = new TQGroupBox( i18n("Startup"), page ); - QGridLayout * startupLayout = new QGridLayout( m_GeneralWidgets.startupGB, 3, 2 ); + TQGridLayout * startupLayout = new TQGridLayout( m_GeneralWidgets.startupGB, 3, 2 ); startupLayout -> setSpacing( spacingHint() ); startupLayout -> setMargin( fontMetrics().height() ); - m_GeneralWidgets.logoCB = new QCheckBox( i18n("Sta&rtup logo"), m_GeneralWidgets.startupGB ); + m_GeneralWidgets.logoCB = new TQCheckBox( i18n("Sta&rtup logo"), m_GeneralWidgets.startupGB ); m_GeneralWidgets.logoCB -> setChecked( m_pOptionState->generalState.logo ); startupLayout -> addWidget( m_GeneralWidgets.logoCB, 0, 0 ); - m_GeneralWidgets.tipCB = new QCheckBox( i18n("&Tip of the day"), m_GeneralWidgets.startupGB ); + m_GeneralWidgets.tipCB = new TQCheckBox( i18n("&Tip of the day"), m_GeneralWidgets.startupGB ); m_GeneralWidgets.tipCB -> setChecked( m_pOptionState->generalState.tip ); startupLayout -> addWidget( m_GeneralWidgets.tipCB, 0, 1 ); - m_GeneralWidgets.loadlastCB = new QCheckBox( i18n("&Load last project"), m_GeneralWidgets.startupGB ); + m_GeneralWidgets.loadlastCB = new TQCheckBox( i18n("&Load last project"), m_GeneralWidgets.startupGB ); m_GeneralWidgets.loadlastCB -> setChecked( m_pOptionState->generalState.loadlast ); startupLayout -> addWidget( m_GeneralWidgets.loadlastCB, 1, 0 ); - m_GeneralWidgets.startL = new QLabel( i18n("Start new project with:"), m_GeneralWidgets.startupGB ); + m_GeneralWidgets.startL = new TQLabel( i18n("Start new project with:"), m_GeneralWidgets.startupGB ); startupLayout -> addWidget( m_GeneralWidgets.startL, 2, 0 ); m_GeneralWidgets.diagramKB = new KComboBox( m_GeneralWidgets.startupGB ); m_GeneralWidgets.diagramKB->setCompletionMode( KGlobalSettings::CompletionPopup ); startupLayout -> addWidget( m_GeneralWidgets.diagramKB, 2, 1 ); - QString diagrams [] = { i18n("No Diagram"), i18n("Class Diagram"), + TQString diagrams [] = { i18n("No Diagram"), i18n("Class Diagram"), i18n("Use Case Diagram"), i18n("Sequence Diagram"), i18n("Collaboration Diagram"), i18n("State Diagram"), i18n("Activity Diagram"), i18n("Component Diagram"), @@ -192,13 +192,13 @@ void SettingsDlg::setupGeneralPage() { } m_GeneralWidgets.diagramKB->setCurrentItem( (int)m_pOptionState->generalState.diagram-1 ); - connect( m_GeneralWidgets.autosaveCB, SIGNAL(clicked()), this, SLOT(slotAutosaveCBClicked()) ); + connect( m_GeneralWidgets.autosaveCB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAutosaveCBClicked()) ); } /** * Inserts @p type into the type-combobox as well as its completion object. */ -void SettingsDlg::insertDiagram( const QString& type, int index ) +void SettingsDlg::insertDiagram( const TQString& type, int index ) { m_GeneralWidgets.diagramKB->insertItem( type, index ); m_GeneralWidgets.diagramKB->completionObject()->addItem( type ); @@ -207,52 +207,52 @@ void SettingsDlg::insertDiagram( const QString& type, int index ) void SettingsDlg::setupClassPage() { //setup class settings page - QVBox * page = addVBoxPage( i18n("Class"), i18n("Class Settings"), DesktopIcon( "edit") ); - m_ClassWidgets.visibilityGB = new QGroupBox( i18n("Visibility"), page ); + TQVBox * page = addVBoxPage( i18n("Class"), i18n("Class Settings"), DesktopIcon( "edit") ); + m_ClassWidgets.visibilityGB = new TQGroupBox( i18n("Visibility"), page ); - QGridLayout * visibilityLayout = new QGridLayout( m_ClassWidgets.visibilityGB ); + TQGridLayout * visibilityLayout = new TQGridLayout( m_ClassWidgets.visibilityGB ); visibilityLayout -> setSpacing( spacingHint() ); visibilityLayout -> setMargin( fontMetrics().height() ); - m_ClassWidgets.showVisibilityCB = new QCheckBox(i18n("Show &visibility"), m_ClassWidgets.visibilityGB); + m_ClassWidgets.showVisibilityCB = new TQCheckBox(i18n("Show &visibility"), m_ClassWidgets.visibilityGB); m_ClassWidgets.showVisibilityCB -> setChecked( m_pOptionState->classState.showVisibility ); visibilityLayout -> addWidget( m_ClassWidgets.showVisibilityCB, 0, 0 ); - m_ClassWidgets.showAttsCB = new QCheckBox( i18n("Show attributes"), m_ClassWidgets.visibilityGB ); + m_ClassWidgets.showAttsCB = new TQCheckBox( i18n("Show attributes"), m_ClassWidgets.visibilityGB ); m_ClassWidgets.showAttsCB -> setChecked( m_pOptionState->classState.showAtts ); visibilityLayout -> addWidget( m_ClassWidgets.showAttsCB, 0, 1 ); - m_ClassWidgets.showOpsCB = new QCheckBox( i18n("Show operations"), m_ClassWidgets.visibilityGB ); + m_ClassWidgets.showOpsCB = new TQCheckBox( i18n("Show operations"), m_ClassWidgets.visibilityGB ); m_ClassWidgets.showOpsCB -> setChecked( m_pOptionState->classState.showOps ); visibilityLayout -> addWidget( m_ClassWidgets.showOpsCB, 1, 0 ); - m_ClassWidgets.showStereotypeCB = new QCheckBox( i18n("Show stereot&ype"), m_ClassWidgets.visibilityGB ); + m_ClassWidgets.showStereotypeCB = new TQCheckBox( i18n("Show stereot&ype"), m_ClassWidgets.visibilityGB ); m_ClassWidgets.showStereotypeCB -> setChecked( m_pOptionState->classState.showStereoType ); visibilityLayout -> addWidget( m_ClassWidgets.showStereotypeCB, 1, 1 ); - m_ClassWidgets.showAttSigCB = new QCheckBox(i18n("Show attribute signature"), m_ClassWidgets.visibilityGB); + m_ClassWidgets.showAttSigCB = new TQCheckBox(i18n("Show attribute signature"), m_ClassWidgets.visibilityGB); m_ClassWidgets.showAttSigCB -> setChecked( m_pOptionState->classState.showAttSig ); visibilityLayout -> addWidget( m_ClassWidgets.showAttSigCB, 2, 0 ); - m_ClassWidgets.showPackageCB = new QCheckBox(i18n("Show package"), m_ClassWidgets.visibilityGB); + m_ClassWidgets.showPackageCB = new TQCheckBox(i18n("Show package"), m_ClassWidgets.visibilityGB); m_ClassWidgets.showPackageCB -> setChecked( m_pOptionState->classState.showPackage ); visibilityLayout -> addWidget( m_ClassWidgets.showPackageCB, 2, 1 ); - m_ClassWidgets.showOpSigCB = new QCheckBox( i18n("Show operation signature"), m_ClassWidgets.visibilityGB ); + m_ClassWidgets.showOpSigCB = new TQCheckBox( i18n("Show operation signature"), m_ClassWidgets.visibilityGB ); m_ClassWidgets.showOpSigCB -> setChecked( m_pOptionState->classState.showOpSig ); visibilityLayout -> addWidget( m_ClassWidgets.showOpSigCB, 3, 0 ); visibilityLayout -> setRowStretch( 3, 1 ); - m_ClassWidgets.scopeGB = new QGroupBox( i18n("Starting Scope"), page ); - QGridLayout * scopeLayout = new QGridLayout( m_ClassWidgets.scopeGB ); + m_ClassWidgets.scopeGB = new TQGroupBox( i18n("Starting Scope"), page ); + TQGridLayout * scopeLayout = new TQGridLayout( m_ClassWidgets.scopeGB ); scopeLayout -> setSpacing( spacingHint() ); scopeLayout -> setMargin( fontMetrics().height() ); - m_ClassWidgets.attributeLabel = new QLabel( i18n("Default attribute scope:"), m_ClassWidgets.scopeGB); + m_ClassWidgets.attributeLabel = new TQLabel( i18n("Default attribute scope:"), m_ClassWidgets.scopeGB); scopeLayout -> addWidget( m_ClassWidgets.attributeLabel, 0, 0 ); - m_ClassWidgets.operationLabel = new QLabel( i18n("Default operation scope:"), m_ClassWidgets.scopeGB); + m_ClassWidgets.operationLabel = new TQLabel( i18n("Default operation scope:"), m_ClassWidgets.scopeGB); scopeLayout -> addWidget( m_ClassWidgets.operationLabel, 1, 0 ); m_ClassWidgets.m_pAttribScopeCB = new KComboBox(m_ClassWidgets.scopeGB); @@ -275,7 +275,7 @@ void SettingsDlg::setupClassPage() { /** * Inserts @p type into the type-combobox as well as its completion object. */ -void SettingsDlg::insertAttribScope( const QString& type, int index ) +void SettingsDlg::insertAttribScope( const TQString& type, int index ) { m_ClassWidgets.m_pAttribScopeCB->insertItem( type, index ); m_ClassWidgets.m_pAttribScopeCB->completionObject()->addItem( type ); @@ -283,7 +283,7 @@ void SettingsDlg::insertAttribScope( const QString& type, int index ) /** * Inserts @p type into the type-combobox as well as its completion object. */ -void SettingsDlg::insertOperationScope( const QString& type, int index ) +void SettingsDlg::insertOperationScope( const TQString& type, int index ) { m_ClassWidgets.m_pOperationScopeCB->insertItem( type, index ); m_ClassWidgets.m_pOperationScopeCB->completionObject()->addItem( type ); @@ -291,20 +291,20 @@ void SettingsDlg::insertOperationScope( const QString& type, int index ) void SettingsDlg::setupCodeGenPage() { //setup code generation settings page - QVBox * page = addVBoxPage( i18n("Code Generation"), i18n("Code Generation Settings"), DesktopIcon( "source") ); + TQVBox * page = addVBoxPage( i18n("Code Generation"), i18n("Code Generation Settings"), DesktopIcon( "source") ); m_pCodeGenPage = new CodeGenerationOptionsPage(page); - connect( m_pCodeGenPage, SIGNAL(languageChanged()), this, SLOT(slotApply()) ); + connect( m_pCodeGenPage, TQT_SIGNAL(languageChanged()), this, TQT_SLOT(slotApply()) ); } void SettingsDlg::setupCodeViewerPage(Settings::CodeViewerState options) { //setup code generation settings page - QVBox * page = addVBoxPage( i18n("Code Viewer"), i18n("Code Viewer Settings"), DesktopIcon( "source") ); + TQVBox * page = addVBoxPage( i18n("Code Viewer"), i18n("Code Viewer Settings"), DesktopIcon( "source") ); m_pCodeViewerPage = new CodeViewerOptionsPage(options, page); } void SettingsDlg::setupFontPage() { - QVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts") ); - m_FontWidgets.chooser = new KFontChooser( page, "font", false, QStringList(), false); + TQVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts") ); + m_FontWidgets.chooser = new KFontChooser( page, "font", false, TQStringList(), false); m_FontWidgets.chooser->setFont( m_pOptionState->uiState.font ); } @@ -348,7 +348,7 @@ void SettingsDlg::slotDefault() { case Settings::page_UI: m_UiWidgets.useFillColorCB -> setChecked( true ); - m_UiWidgets.fillColorB -> setColor( QColor( 255, 255, 192 ) ); + m_UiWidgets.fillColorB -> setColor( TQColor( 255, 255, 192 ) ); m_UiWidgets.lineColorB -> setColor( Qt::red ); m_UiWidgets.lineWidthB -> setValue( 0 ); break; @@ -429,14 +429,14 @@ void SettingsDlg::slotLineBClicked() { } void SettingsDlg::slotFillBClicked() { - m_UiWidgets.fillColorB -> setColor( QColor(255, 255, 192) ); + m_UiWidgets.fillColorB -> setColor( TQColor(255, 255, 192) ); } void SettingsDlg::slotAutosaveCBClicked() { m_GeneralWidgets.timeISB -> setEnabled( m_GeneralWidgets.autosaveCB -> isChecked() ); } -QString SettingsDlg::getCodeGenerationLanguage() { +TQString SettingsDlg::getCodeGenerationLanguage() { return m_pCodeGenPage->getCodeGenerationLanguage(); } diff --git a/umbrello/umbrello/dialogs/settingsdlg.h b/umbrello/umbrello/dialogs/settingsdlg.h index 30579990..c00437b2 100644 --- a/umbrello/umbrello/dialogs/settingsdlg.h +++ b/umbrello/umbrello/dialogs/settingsdlg.h @@ -13,13 +13,13 @@ #ifndef SETTINGSDLG_H #define SETTINGSDLG_H //qt includes -#include <qgroupbox.h> -#include <qcheckbox.h> -#include <qpushbutton.h> -#include <qlabel.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> -#include <qdict.h> +#include <tqgroupbox.h> +#include <tqcheckbox.h> +#include <tqpushbutton.h> +#include <tqlabel.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> +#include <tqdict.h> //kde includes #include <kcombobox.h> #include <kfontdialog.h> @@ -45,7 +45,7 @@ class SettingsDlg : public KDialogBase { Q_OBJECT public: - SettingsDlg(QWidget * parent, Settings::OptionState *state); + SettingsDlg(TQWidget * parent, Settings::OptionState *state); ~SettingsDlg(); //public methods @@ -53,86 +53,86 @@ public: return m_bChangesApplied; } - QString getCodeGenerationLanguage(); + TQString getCodeGenerationLanguage(); protected: /** * Inserts @p type into the type-combobox as well as its completion object. */ - void insertDiagram( const QString& type, int index = -1 ); + void insertDiagram( const TQString& type, int index = -1 ); /** * Inserts @p type into the type-combobox as well as its completion object. */ - void insertAttribScope( const QString& type, int index = -1 ); + void insertAttribScope( const TQString& type, int index = -1 ); /** * Inserts @p type into the type-combobox as well as its completion object. */ - void insertOperationScope( const QString& type, int index = -1 ); + void insertOperationScope( const TQString& type, int index = -1 ); private: //private structs struct UIWidgets { - QGroupBox * colorGB; + TQGroupBox * colorGB; - QLabel * lineColorL; - QLabel * fillColorL; - QLabel * lineWidthL; + TQLabel * lineColorL; + TQLabel * fillColorL; + TQLabel * lineWidthL; - QPushButton * lineDefaultB; - QPushButton * fillDefaultB; - QPushButton * lineWidthDefaultB; + TQPushButton * lineDefaultB; + TQPushButton * fillDefaultB; + TQPushButton * lineWidthDefaultB; KColorButton * lineColorB; KColorButton * fillColorB; KIntSpinBox * lineWidthB; - QCheckBox * useFillColorCB; + TQCheckBox * useFillColorCB; } ;//end struct UIWidgets struct GeneralWidgets { - QGroupBox * miscGB; - QGroupBox * autosaveGB; - QGroupBox * startupGB; + TQGroupBox * miscGB; + TQGroupBox * autosaveGB; + TQGroupBox * startupGB; KIntSpinBox * timeISB; KComboBox * diagramKB; - QCheckBox * undoCB; - QCheckBox * tabdiagramsCB; - QCheckBox * newcodegenCB; - QCheckBox * angularLinesCB; - QCheckBox * autosaveCB; - QCheckBox * logoCB; - QCheckBox * tipCB; - QCheckBox * loadlastCB; + TQCheckBox * undoCB; + TQCheckBox * tabdiagramsCB; + TQCheckBox * newcodegenCB; + TQCheckBox * angularLinesCB; + TQCheckBox * autosaveCB; + TQCheckBox * logoCB; + TQCheckBox * tipCB; + TQCheckBox * loadlastCB; // 2004-05-17 Achim Spangler: Allow definition of Suffix for autosave // ( Default: ".xmi" ) - QLineEdit * autosaveSuffixT; - QLabel * autosaveSuffixL; + TQLineEdit * autosaveSuffixT; + TQLabel * autosaveSuffixL; // End AutoSave Suffix - QLabel * startL; - QLabel * autosaveL; + TQLabel * startL; + TQLabel * autosaveL; } ;//end struct GeneralWidgets struct ClassWidgets { - QGroupBox * visibilityGB; - QGroupBox * scopeGB; + TQGroupBox * visibilityGB; + TQGroupBox * scopeGB; - QCheckBox * showVisibilityCB; - QCheckBox * showAttsCB; - QCheckBox * showOpsCB; - QCheckBox * showStereotypeCB; - QCheckBox * showAttSigCB; - QCheckBox * showPackageCB; + TQCheckBox * showVisibilityCB; + TQCheckBox * showAttsCB; + TQCheckBox * showOpsCB; + TQCheckBox * showStereotypeCB; + TQCheckBox * showAttSigCB; + TQCheckBox * showPackageCB; - QCheckBox * showOpSigCB; + TQCheckBox * showOpSigCB; - QLabel * attributeLabel; - QLabel * operationLabel; + TQLabel * attributeLabel; + TQLabel * operationLabel; KComboBox* m_pAttribScopeCB; KComboBox* m_pOperationScopeCB; diff --git a/umbrello/umbrello/dialogs/statedialog.cpp b/umbrello/umbrello/dialogs/statedialog.cpp index 691597e9..564146ec 100644 --- a/umbrello/umbrello/dialogs/statedialog.cpp +++ b/umbrello/umbrello/dialogs/statedialog.cpp @@ -13,11 +13,11 @@ #include "statedialog.h" //qt includes -#include <qlayout.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qmultilineedit.h> -#include <qgroupbox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqmultilineedit.h> +#include <tqgroupbox.h> //kde includes #include <kiconloader.h> @@ -82,13 +82,13 @@ void StateDialog::applyPage( Page page ) { } void StateDialog::setupGeneralPage() { - QString types[ ] = { i18n("Initial state"), i18n("State"), i18n("End state") }; + TQString types[ ] = { i18n("Initial state"), i18n("State"), i18n("End state") }; StateWidget::StateType type = m_pStateWidget -> getStateType(); - QVBox * page = addVBoxPage( i18n("General"), i18n("General Properties"), DesktopIcon( "misc") ); - m_GenPageWidgets.generalGB = new QGroupBox( i18n( "Properties"), (QWidget *)page ); + TQVBox * page = addVBoxPage( i18n("General"), i18n("General Properties"), DesktopIcon( "misc") ); + m_GenPageWidgets.generalGB = new TQGroupBox( i18n( "Properties"), (TQWidget *)page ); - QGridLayout * generalLayout = new QGridLayout( m_GenPageWidgets.generalGB, 2, 2 ); + TQGridLayout * generalLayout = new TQGridLayout( m_GenPageWidgets.generalGB, 2, 2 ); generalLayout -> setSpacing( spacingHint() ); generalLayout -> setMargin( fontMetrics().height() ); @@ -101,13 +101,13 @@ void StateDialog::setupGeneralPage() { m_GenPageWidgets.nameL, i18n("State name:"), m_GenPageWidgets.nameLE ); - m_GenPageWidgets.docGB = new QGroupBox( i18n( "Documentation"), (QWidget *)page ); + m_GenPageWidgets.docGB = new TQGroupBox( i18n( "Documentation"), (TQWidget *)page ); - QHBoxLayout * docLayout = new QHBoxLayout( m_GenPageWidgets.docGB ); + TQHBoxLayout * docLayout = new TQHBoxLayout( m_GenPageWidgets.docGB ); docLayout -> setSpacing( spacingHint() ); docLayout -> setMargin( fontMetrics().height() ); - m_GenPageWidgets.docMLE = new QMultiLineEdit( m_GenPageWidgets.docGB ); + m_GenPageWidgets.docMLE = new TQMultiLineEdit( m_GenPageWidgets.docGB ); m_GenPageWidgets.docMLE -> setText( m_pStateWidget -> getDoc() ); docLayout -> addWidget( m_GenPageWidgets.docMLE ); @@ -121,21 +121,21 @@ void StateDialog::setupGeneralPage() { void StateDialog::setupFontPage() { if ( !m_pStateWidget ) return; - QVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts") ); - m_pChooser = new KFontChooser( (QWidget*)page, "font", false, QStringList(), false); + TQVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts") ); + m_pChooser = new KFontChooser( (TQWidget*)page, "font", false, TQStringList(), false); m_pChooser -> setFont( m_pStateWidget -> getFont() ); } void StateDialog::setupColorPage() { - QFrame * colorPage = addPage( i18n("Color"), i18n("Widget Color"), DesktopIcon( "colors") ); - QHBoxLayout * m_pColorLayout = new QHBoxLayout(colorPage); + TQFrame * colorPage = addPage( i18n("Color"), i18n("Widget Color"), DesktopIcon( "colors") ); + TQHBoxLayout * m_pColorLayout = new TQHBoxLayout(colorPage); m_pColorPage = new UMLWidgetColorPage( colorPage, m_pStateWidget ); m_pColorLayout -> addWidget(m_pColorPage); } void StateDialog::setupActivityPage() { - QFrame * activityPage = addPage( i18n("Activities"), i18n("Activities"), DesktopIcon( "misc") ); - QHBoxLayout * activityLayout = new QHBoxLayout( activityPage ); + TQFrame * activityPage = addPage( i18n("Activities"), i18n("Activities"), DesktopIcon( "misc") ); + TQHBoxLayout * activityLayout = new TQHBoxLayout( activityPage ); m_pActivityPage = new ActivityPage( activityPage, m_pStateWidget ); activityLayout -> addWidget( m_pActivityPage ); } diff --git a/umbrello/umbrello/dialogs/statedialog.h b/umbrello/umbrello/dialogs/statedialog.h index d364d6be..07e60898 100644 --- a/umbrello/umbrello/dialogs/statedialog.h +++ b/umbrello/umbrello/dialogs/statedialog.h @@ -132,11 +132,11 @@ protected: bool m_bChangesMade; struct GeneralPageWidgets { - QLabel * nameL, * typeL; - QLineEdit * nameLE, * typeLE; - QMultiLineEdit * docMLE; + TQLabel * nameL, * typeL; + TQLineEdit * nameLE, * typeLE; + TQMultiLineEdit * docMLE; - QGroupBox * docGB, * generalGB; + TQGroupBox * docGB, * generalGB; } m_GenPageWidgets; }; diff --git a/umbrello/umbrello/dialogs/umlattributedialog.cpp b/umbrello/umbrello/dialogs/umlattributedialog.cpp index e6a52725..d6ea57ce 100644 --- a/umbrello/umbrello/dialogs/umlattributedialog.cpp +++ b/umbrello/umbrello/dialogs/umlattributedialog.cpp @@ -13,13 +13,13 @@ #include "umlattributedialog.h" // qt includes -#include <qlayout.h> -#include <qlineedit.h> -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> +#include <tqlabel.h> // kde includes #include <kcombobox.h> @@ -38,7 +38,7 @@ #include "../object_factory.h" #include "../codeimport/import_utils.h" -UMLAttributeDialog::UMLAttributeDialog( QWidget * pParent, UMLAttribute * pAttribute ) +UMLAttributeDialog::UMLAttributeDialog( TQWidget * pParent, UMLAttribute * pAttribute ) : KDialogBase( Plain, i18n("Attribute Properties"), Help | Ok | Cancel , Ok, pParent, "_UMLATTRIBUTEDLG_", true, true) { m_pAttribute = pAttribute; setupDialog(); @@ -50,14 +50,14 @@ void UMLAttributeDialog::setupDialog() { UMLDoc * pDoc = UMLApp::app()->getDocument(); int margin = fontMetrics().height(); - QVBoxLayout * mainLayout = new QVBoxLayout( plainPage() ); + TQVBoxLayout * mainLayout = new TQVBoxLayout( plainPage() ); - m_pValuesGB = new QGroupBox(i18n("General Properties"), plainPage() ); - QGridLayout * valuesLayout = new QGridLayout(m_pValuesGB, 5, 2); + m_pValuesGB = new TQGroupBox(i18n("General Properties"), plainPage() ); + TQGridLayout * valuesLayout = new TQGridLayout(m_pValuesGB, 5, 2); valuesLayout -> setMargin(margin); valuesLayout -> setSpacing(10); - m_pTypeL = new QLabel(i18n("&Type:"), m_pValuesGB); + m_pTypeL = new TQLabel(i18n("&Type:"), m_pValuesGB); valuesLayout -> addWidget(m_pTypeL, 0, 0); m_pTypeCB = new KComboBox(true, m_pValuesGB); @@ -76,7 +76,7 @@ void UMLAttributeDialog::setupDialog() { m_pStereoTypeL, i18n("Stereotype name:"), m_pStereoTypeLE, m_pAttribute->getStereotype() ); - m_pStaticCB = new QCheckBox( i18n("Classifier &scope (\"static\")"), m_pValuesGB ); + m_pStaticCB = new TQCheckBox( i18n("Classifier &scope (\"static\")"), m_pValuesGB ); m_pStaticCB -> setChecked( m_pAttribute -> getStatic() ); valuesLayout -> addWidget(m_pStaticCB, 4, 0); @@ -84,20 +84,20 @@ void UMLAttributeDialog::setupDialog() { mainLayout -> addWidget(m_pValuesGB); - m_pScopeBG = new QButtonGroup(i18n("Visibility"), plainPage() ); - QHBoxLayout * scopeLayout = new QHBoxLayout(m_pScopeBG); + m_pScopeBG = new TQButtonGroup(i18n("Visibility"), plainPage() ); + TQHBoxLayout * scopeLayout = new TQHBoxLayout(m_pScopeBG); scopeLayout -> setMargin(margin); - m_pPublicRB = new QRadioButton(i18n("&Public"), m_pScopeBG); + m_pPublicRB = new TQRadioButton(i18n("&Public"), m_pScopeBG); scopeLayout -> addWidget(m_pPublicRB); - m_pPrivateRB = new QRadioButton(i18n("P&rivate"), m_pScopeBG); + m_pPrivateRB = new TQRadioButton(i18n("P&rivate"), m_pScopeBG); scopeLayout -> addWidget(m_pPrivateRB); - m_pProtectedRB = new QRadioButton(i18n("Prot&ected"), m_pScopeBG); + m_pProtectedRB = new TQRadioButton(i18n("Prot&ected"), m_pScopeBG); scopeLayout -> addWidget(m_pProtectedRB); - m_pImplementationRB = new QRadioButton(i18n("I&mplementation"), m_pScopeBG); + m_pImplementationRB = new TQRadioButton(i18n("I&mplementation"), m_pScopeBG); scopeLayout -> addWidget(m_pImplementationRB); mainLayout -> addWidget(m_pScopeBG); @@ -125,7 +125,7 @@ void UMLAttributeDialog::setupDialog() { int typeBoxCount = 0; bool foundType = false; while (typeBoxCount < m_pTypeCB->count() && foundType == false) { - QString typeBoxString = m_pTypeCB->text(typeBoxCount); + TQString typeBoxString = m_pTypeCB->text(typeBoxCount); if ( typeBoxString == m_pAttribute->getTypeName() ) { foundType = true; m_pTypeCB->setCurrentItem(typeBoxCount); @@ -140,17 +140,17 @@ void UMLAttributeDialog::setupDialog() { } m_pNameLE->setFocus(); - connect( m_pNameLE, SIGNAL( textChanged ( const QString & ) ), SLOT( slotNameChanged( const QString & ) ) ); + connect( m_pNameLE, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotNameChanged( const TQString & ) ) ); slotNameChanged(m_pNameLE->text() ); } -void UMLAttributeDialog::slotNameChanged( const QString &_text ) +void UMLAttributeDialog::slotNameChanged( const TQString &_text ) { enableButtonOK( !_text.isEmpty() ); } bool UMLAttributeDialog::apply() { - QString name = m_pNameLE->text(); + TQString name = m_pNameLE->text(); if (name.isEmpty()) { KMessageBox::error(this, i18n("You have entered an invalid attribute name."), i18n("Attribute Name Invalid"), false); @@ -184,7 +184,7 @@ bool UMLAttributeDialog::apply() { m_pAttribute->setStereotype( m_pStereoTypeLE->text() ); m_pAttribute->setStatic( m_pStaticCB->isChecked() ); - QString typeName = m_pTypeCB->currentText(); + TQString typeName = m_pTypeCB->currentText(); UMLTemplate *tmplParam = pConcept->findTemplate(typeName); if (tmplParam) { m_pAttribute->setType(tmplParam); @@ -225,7 +225,7 @@ void UMLAttributeDialog::slotOk() { } } -void UMLAttributeDialog::insertType( const QString& type, int index ) +void UMLAttributeDialog::insertType( const TQString& type, int index ) { m_pTypeCB->insertItem( type, index ); m_pTypeCB->completionObject()->addItem( type ); diff --git a/umbrello/umbrello/dialogs/umlattributedialog.h b/umbrello/umbrello/dialogs/umlattributedialog.h index 92305d61..7994c187 100644 --- a/umbrello/umbrello/dialogs/umlattributedialog.h +++ b/umbrello/umbrello/dialogs/umlattributedialog.h @@ -30,7 +30,7 @@ class QLineEdit; class UMLAttributeDialog : public KDialogBase { Q_OBJECT public: - UMLAttributeDialog( QWidget * pParent, UMLAttribute * pAttribute ); + UMLAttributeDialog( TQWidget * pParent, UMLAttribute * pAttribute ); ~UMLAttributeDialog(); protected: @@ -48,7 +48,7 @@ protected: /** * Inserts @p type into the type-combobox as well as its completion object. */ - void insertType( const QString& type, int index = -1 ); + void insertType( const TQString& type, int index = -1 ); /** * The Attribute to represent @@ -56,13 +56,13 @@ protected: UMLAttribute * m_pAttribute; //GUI Widgets - QGroupBox * m_pAttsGB, * m_pValuesGB; - QButtonGroup * m_pScopeBG; - QRadioButton * m_pPublicRB, * m_pPrivateRB, * m_pProtectedRB, * m_pImplementationRB; - QLabel * m_pTypeL, * m_pNameL, * m_pInitialL, * m_pStereoTypeL; + TQGroupBox * m_pAttsGB, * m_pValuesGB; + TQButtonGroup * m_pScopeBG; + TQRadioButton * m_pPublicRB, * m_pPrivateRB, * m_pProtectedRB, * m_pImplementationRB; + TQLabel * m_pTypeL, * m_pNameL, * m_pInitialL, * m_pStereoTypeL; KComboBox * m_pTypeCB; - QLineEdit * m_pNameLE, * m_pInitialLE, * m_pStereoTypeLE; - QCheckBox* m_pStaticCB; + TQLineEdit * m_pNameLE, * m_pInitialLE, * m_pStereoTypeLE; + TQCheckBox* m_pStaticCB; public slots: /** @@ -75,7 +75,7 @@ public slots: * Used when the OK button is clicked. Calls apply() */ void slotOk(); - void slotNameChanged( const QString & ); + void slotNameChanged( const TQString & ); }; #endif diff --git a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp index ef6a5791..55a47857 100644 --- a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp +++ b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp @@ -13,13 +13,13 @@ #include "umlentityattributedialog.h" // qt includes -#include <qlayout.h> -#include <qlineedit.h> -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> +#include <tqlabel.h> // kde includes #include <kcombobox.h> @@ -39,7 +39,7 @@ #include "../object_factory.h" #include "../umlclassifierlist.h" -UMLEntityAttributeDialog::UMLEntityAttributeDialog( QWidget * pParent, UMLEntityAttribute * pEntityAttribute ) +UMLEntityAttributeDialog::UMLEntityAttributeDialog( TQWidget * pParent, UMLEntityAttribute * pEntityAttribute ) : KDialogBase( Plain, i18n("Entity Attribute Properties"), Help | Ok | Cancel , Ok, pParent, "_UMLENTITYATTRIBUTEDLG_", true, true) { m_pEntityAttribute = pEntityAttribute; setupDialog(); @@ -51,14 +51,14 @@ void UMLEntityAttributeDialog::setupDialog() { UMLDoc * pDoc = UMLApp::app()->getDocument(); int margin = fontMetrics().height(); - QVBoxLayout * mainLayout = new QVBoxLayout( plainPage() ); + TQVBoxLayout * mainLayout = new TQVBoxLayout( plainPage() ); - m_pValuesGB = new QGroupBox(i18n("General Properties"), plainPage() ); - QGridLayout * valuesLayout = new QGridLayout(m_pValuesGB, 5, 2); + m_pValuesGB = new TQGroupBox(i18n("General Properties"), plainPage() ); + TQGridLayout * valuesLayout = new TQGridLayout(m_pValuesGB, 5, 2); valuesLayout -> setMargin(margin); valuesLayout -> setSpacing(10); - m_pTypeL = new QLabel(i18n("&Type:"), m_pValuesGB); + m_pTypeL = new TQLabel(i18n("&Type:"), m_pValuesGB); valuesLayout -> addWidget(m_pTypeL, 0, 0); m_pTypeCB = new KComboBox(true, m_pValuesGB); @@ -81,15 +81,15 @@ void UMLEntityAttributeDialog::setupDialog() { m_pValuesL, i18n("Length/Values:"), m_pValuesLE, m_pEntityAttribute->getValues() ); - m_pAutoIncrementCB = new QCheckBox( i18n("&Auto increment"), m_pValuesGB ); + m_pAutoIncrementCB = new TQCheckBox( i18n("&Auto increment"), m_pValuesGB ); m_pAutoIncrementCB->setChecked( m_pEntityAttribute->getAutoIncrement() ); valuesLayout->addWidget(m_pAutoIncrementCB, 5, 0); - m_pNullCB = new QCheckBox( i18n("Allow &null"), m_pValuesGB ); + m_pNullCB = new TQCheckBox( i18n("Allow &null"), m_pValuesGB ); m_pNullCB->setChecked( m_pEntityAttribute->getNull() ); valuesLayout->addWidget(m_pNullCB, 6, 0); - m_pAttributesL = new QLabel(i18n("Attributes:"), m_pValuesGB); + m_pAttributesL = new TQLabel(i18n("Attributes:"), m_pValuesGB); valuesLayout->addWidget(m_pAttributesL, 7, 0); m_pAttributesCB = new KComboBox(true, m_pValuesGB); @@ -105,20 +105,20 @@ void UMLEntityAttributeDialog::setupDialog() { mainLayout -> addWidget(m_pValuesGB); - m_pScopeBG = new QButtonGroup(i18n("Indexing"), plainPage() ); - QHBoxLayout* scopeLayout = new QHBoxLayout(m_pScopeBG); + m_pScopeBG = new TQButtonGroup(i18n("Indexing"), plainPage() ); + TQHBoxLayout* scopeLayout = new TQHBoxLayout(m_pScopeBG); scopeLayout->setMargin(margin); - m_pNoneRB = new QRadioButton(i18n("&None"), m_pScopeBG); + m_pNoneRB = new TQRadioButton(i18n("&None"), m_pScopeBG); scopeLayout->addWidget(m_pNoneRB); - m_pPublicRB = new QRadioButton(i18n("&Primary"), m_pScopeBG); + m_pPublicRB = new TQRadioButton(i18n("&Primary"), m_pScopeBG); scopeLayout->addWidget(m_pPublicRB); - m_pPrivateRB = new QRadioButton(i18n("&Index"), m_pScopeBG); + m_pPrivateRB = new TQRadioButton(i18n("&Index"), m_pScopeBG); scopeLayout->addWidget(m_pPrivateRB); - m_pProtectedRB = new QRadioButton(i18n("&Unique"), m_pScopeBG); + m_pProtectedRB = new TQRadioButton(i18n("&Unique"), m_pScopeBG); scopeLayout->addWidget(m_pProtectedRB); mainLayout->addWidget(m_pScopeBG); @@ -154,7 +154,7 @@ void UMLEntityAttributeDialog::setupDialog() { int typeBoxCount = 0; bool foundType = false; while (typeBoxCount < m_pTypeCB->count() && foundType == false) { - QString typeBoxString = m_pTypeCB->text(typeBoxCount); + TQString typeBoxString = m_pTypeCB->text(typeBoxCount); if ( typeBoxString == m_pEntityAttribute->getTypeName() ) { foundType = true; m_pTypeCB->setCurrentItem(typeBoxCount); @@ -169,17 +169,17 @@ void UMLEntityAttributeDialog::setupDialog() { } m_pNameLE->setFocus(); - connect( m_pNameLE, SIGNAL( textChanged ( const QString & ) ), SLOT( slotNameChanged( const QString & ) ) ); + connect( m_pNameLE, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotNameChanged( const TQString & ) ) ); slotNameChanged(m_pNameLE->text() ); } -void UMLEntityAttributeDialog::slotNameChanged( const QString &_text ) +void UMLEntityAttributeDialog::slotNameChanged( const TQString &_text ) { enableButtonOK( !_text.isEmpty() ); } bool UMLEntityAttributeDialog::apply() { - QString name = m_pNameLE->text(); + TQString name = m_pNameLE->text(); if (name.isEmpty()) { KMessageBox::error(this, i18n("You have entered an invalid entity attribute name."), i18n("Entity Attribute Name Invalid"), false); @@ -212,7 +212,7 @@ bool UMLEntityAttributeDialog::apply() { m_pEntityAttribute->setIndexType(Uml::None); } - QString typeName = m_pTypeCB->currentText(); + TQString typeName = m_pTypeCB->currentText(); UMLDoc *pDoc = UMLApp::app()->getDocument(); UMLClassifierList dataTypes = pDoc->getDatatypes(); UMLClassifier *dat; @@ -248,12 +248,12 @@ void UMLEntityAttributeDialog::slotOk() { } } -void UMLEntityAttributeDialog::insertType( const QString& type, int index ) { +void UMLEntityAttributeDialog::insertType( const TQString& type, int index ) { m_pTypeCB->insertItem( type, index ); m_pTypeCB->completionObject()->addItem( type ); } -void UMLEntityAttributeDialog::insertAttribute( const QString& type, int index ) { +void UMLEntityAttributeDialog::insertAttribute( const TQString& type, int index ) { m_pAttributesCB->insertItem( type, index ); m_pAttributesCB->completionObject()->addItem( type ); } diff --git a/umbrello/umbrello/dialogs/umlentityattributedialog.h b/umbrello/umbrello/dialogs/umlentityattributedialog.h index 0b81472e..9b837e3e 100644 --- a/umbrello/umbrello/dialogs/umlentityattributedialog.h +++ b/umbrello/umbrello/dialogs/umlentityattributedialog.h @@ -30,7 +30,7 @@ class QLineEdit; class UMLEntityAttributeDialog : public KDialogBase { Q_OBJECT public: - UMLEntityAttributeDialog( QWidget* pParent, UMLEntityAttribute* pEntityAttribute ); + UMLEntityAttributeDialog( TQWidget* pParent, UMLEntityAttribute* pEntityAttribute ); ~UMLEntityAttributeDialog(); protected: @@ -48,11 +48,11 @@ protected: /** * Inserts @p type into the type-combobox as well as its completion object. */ - void insertType( const QString& type, int index = -1 ); + void insertType( const TQString& type, int index = -1 ); /** * Inserts @p type into the type-combobox as well as its completion object. */ - void insertAttribute( const QString& type, int index = -1 ); + void insertAttribute( const TQString& type, int index = -1 ); /** * The EntityAttribute to represent @@ -60,15 +60,15 @@ protected: UMLEntityAttribute * m_pEntityAttribute; //GUI Widgets - QGroupBox * m_pAttsGB, * m_pValuesGB; - QButtonGroup * m_pScopeBG; - QRadioButton * m_pPublicRB, * m_pPrivateRB, * m_pProtectedRB, * m_pNoneRB; - QLabel * m_pTypeL, * m_pNameL, * m_pInitialL, * m_pStereoTypeL, * m_pValuesL, * m_pAttributesL ; + TQGroupBox * m_pAttsGB, * m_pValuesGB; + TQButtonGroup * m_pScopeBG; + TQRadioButton * m_pPublicRB, * m_pPrivateRB, * m_pProtectedRB, * m_pNoneRB; + TQLabel * m_pTypeL, * m_pNameL, * m_pInitialL, * m_pStereoTypeL, * m_pValuesL, * m_pAttributesL ; KComboBox * m_pTypeCB; KComboBox * m_pAttributesCB; - QLineEdit * m_pNameLE, * m_pInitialLE, * m_pStereoTypeLE, * m_pValuesLE; - QCheckBox* m_pAutoIncrementCB; - QCheckBox* m_pNullCB; + TQLineEdit * m_pNameLE, * m_pInitialLE, * m_pStereoTypeLE, * m_pValuesLE; + TQCheckBox* m_pAutoIncrementCB; + TQCheckBox* m_pNullCB; public slots: /** @@ -81,7 +81,7 @@ public slots: * Used when the OK button is clicked. Calls apply() */ void slotOk(); - void slotNameChanged( const QString & ); + void slotNameChanged( const TQString & ); }; #endif diff --git a/umbrello/umbrello/dialogs/umloperationdialog.cpp b/umbrello/umbrello/dialogs/umloperationdialog.cpp index 07c56d52..37e8f64c 100644 --- a/umbrello/umbrello/dialogs/umloperationdialog.cpp +++ b/umbrello/umbrello/dialogs/umloperationdialog.cpp @@ -13,15 +13,15 @@ #include "umloperationdialog.h" //qt includes -#include <qlayout.h> -#include <qgroupbox.h> -#include <qlistbox.h> -#include <qbuttongroup.h> -#include <qpushbutton.h> -#include <qradiobutton.h> -#include <qlabel.h> -#include <qcheckbox.h> -#include <qlineedit.h> +#include <tqlayout.h> +#include <tqgroupbox.h> +#include <tqlistbox.h> +#include <tqbuttongroup.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> +#include <tqlabel.h> +#include <tqcheckbox.h> +#include <tqlineedit.h> //kde includes #include <kcombobox.h> @@ -46,7 +46,7 @@ #include "../stereotype.h" #include "../uniqueid.h" -UMLOperationDialog::UMLOperationDialog( QWidget * parent, UMLOperation * pOperation ) +UMLOperationDialog::UMLOperationDialog( TQWidget * parent, UMLOperation * pOperation ) : KDialogBase( Plain, i18n("Operation Properties"), Help | Ok | Cancel , Ok, parent, "_UMLOPERATIONDLG_", true, true) { m_pOperation = pOperation; m_doc = UMLApp::app()->getDocument(); @@ -59,10 +59,10 @@ UMLOperationDialog::~UMLOperationDialog() {} void UMLOperationDialog::setupDialog() { int margin = fontMetrics().height(); - QVBoxLayout * topLayout = new QVBoxLayout( plainPage() ); + TQVBoxLayout * topLayout = new TQVBoxLayout( plainPage() ); - m_pGenGB = new QGroupBox(i18n("General Properties"), plainPage() ); - QGridLayout * genLayout = new QGridLayout(m_pGenGB, 3, 4 ); + m_pGenGB = new TQGroupBox(i18n("General Properties"), plainPage() ); + TQGridLayout * genLayout = new TQGridLayout(m_pGenGB, 3, 4 ); genLayout -> setColStretch(1, 1); genLayout -> setColStretch(3, 1); genLayout -> addColSpacing(1, 200); @@ -74,61 +74,61 @@ void UMLOperationDialog::setupDialog() { m_pNameL, i18n("&Name:"), m_pNameLE, m_pOperation->getName() ); - m_pRtypeL = new QLabel(i18n("&Type:"), m_pGenGB ); + m_pRtypeL = new TQLabel(i18n("&Type:"), m_pGenGB ); genLayout -> addWidget(m_pRtypeL, 0, 2); m_pRtypeCB = new KComboBox(true, m_pGenGB ); genLayout -> addWidget(m_pRtypeCB, 0, 3); m_pRtypeL->setBuddy(m_pRtypeCB); - m_pStereoTypeL = new QLabel( i18n("Stereotype name:"), m_pGenGB ); + m_pStereoTypeL = new TQLabel( i18n("Stereotype name:"), m_pGenGB ); genLayout -> addWidget(m_pStereoTypeL, 1, 0); m_pStereoTypeCB = new KComboBox(true, m_pGenGB ); genLayout -> addWidget(m_pStereoTypeCB, 1, 1); - m_pAbstractCB = new QCheckBox( i18n("&Abstract operation"), m_pGenGB ); + m_pAbstractCB = new TQCheckBox( i18n("&Abstract operation"), m_pGenGB ); m_pAbstractCB -> setChecked( m_pOperation->getAbstract() ); genLayout -> addWidget( m_pAbstractCB, 2, 0 ); - m_pStaticCB = new QCheckBox( i18n("Classifier &scope (\"static\")"), m_pGenGB ); + m_pStaticCB = new TQCheckBox( i18n("Classifier &scope (\"static\")"), m_pGenGB ); m_pStaticCB -> setChecked( m_pOperation->getStatic() ); genLayout -> addWidget( m_pStaticCB, 2, 1 ); - m_pQueryCB = new QCheckBox( i18n("&Query (\"const\")"), m_pGenGB ); + m_pQueryCB = new TQCheckBox( i18n("&Query (\"const\")"), m_pGenGB ); m_pQueryCB -> setChecked( m_pOperation->getConst() ); genLayout -> addWidget( m_pQueryCB, 2, 2 ); topLayout -> addWidget( m_pGenGB ); - m_pScopeBG = new QButtonGroup(i18n("Visibility"), plainPage() ); + m_pScopeBG = new TQButtonGroup(i18n("Visibility"), plainPage() ); - QHBoxLayout * scopeLayout = new QHBoxLayout(m_pScopeBG); + TQHBoxLayout * scopeLayout = new TQHBoxLayout(m_pScopeBG); scopeLayout -> setMargin(margin); - m_pPublicRB = new QRadioButton(i18n("P&ublic"), m_pScopeBG); + m_pPublicRB = new TQRadioButton(i18n("P&ublic"), m_pScopeBG); scopeLayout -> addWidget(m_pPublicRB); - m_pPrivateRB = new QRadioButton(i18n("P&rivate"), m_pScopeBG); + m_pPrivateRB = new TQRadioButton(i18n("P&rivate"), m_pScopeBG); scopeLayout -> addWidget(m_pPrivateRB); - m_pProtectedRB = new QRadioButton(i18n("Prot&ected"), m_pScopeBG); + m_pProtectedRB = new TQRadioButton(i18n("Prot&ected"), m_pScopeBG); scopeLayout -> addWidget(m_pProtectedRB); - m_pImplementationRB = new QRadioButton(i18n("I&mplementation"), m_pScopeBG); + m_pImplementationRB = new TQRadioButton(i18n("I&mplementation"), m_pScopeBG); scopeLayout -> addWidget(m_pImplementationRB); topLayout -> addWidget(m_pScopeBG); - m_pParmsGB = new QGroupBox(i18n("Parameters"), plainPage() ); - QVBoxLayout* parmsLayout = new QVBoxLayout(m_pParmsGB); + m_pParmsGB = new TQGroupBox(i18n("Parameters"), plainPage() ); + TQVBoxLayout* parmsLayout = new TQVBoxLayout(m_pParmsGB); parmsLayout->setMargin(margin); parmsLayout->setSpacing(10); //horizontal box contains the list box and the move up/down buttons - QHBoxLayout* parmsHBoxLayout = new QHBoxLayout(parmsLayout); - m_pParmsLB = new QListBox(m_pParmsGB); + TQHBoxLayout* parmsHBoxLayout = new TQHBoxLayout(parmsLayout); + m_pParmsLB = new TQListBox(m_pParmsGB); parmsHBoxLayout->addWidget(m_pParmsLB); //the move up/down buttons (another vertical box) - QVBoxLayout* buttonLayout = new QVBoxLayout( parmsHBoxLayout ); + TQVBoxLayout* buttonLayout = new TQVBoxLayout( parmsHBoxLayout ); m_pUpButton = new KArrowButton( m_pParmsGB ); m_pUpButton->setEnabled( false ); buttonLayout->addWidget( m_pUpButton ); @@ -138,10 +138,10 @@ void UMLOperationDialog::setupDialog() { buttonLayout->addWidget( m_pDownButton ); KButtonBox* buttonBox = new KButtonBox(m_pParmsGB); - buttonBox->addButton( i18n("Ne&w Parameter..."), this, SLOT(slotNewParameter()) ); - m_pDeleteButton = buttonBox->addButton( i18n("&Delete"), this, SLOT(slotDeleteParameter()) ); + buttonBox->addButton( i18n("Ne&w Parameter..."), this, TQT_SLOT(slotNewParameter()) ); + m_pDeleteButton = buttonBox->addButton( i18n("&Delete"), this, TQT_SLOT(slotDeleteParameter()) ); m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), this, - SLOT(slotParameterProperties()) ); + TQT_SLOT(slotParameterProperties()) ); parmsLayout->addWidget(buttonBox); topLayout -> addWidget(m_pParmsGB); @@ -179,7 +179,7 @@ void UMLOperationDialog::setupDialog() { int returnBoxCount = 0; bool foundReturnType = false; while (returnBoxCount < m_pRtypeCB->count() && foundReturnType == false) { - QString returnBoxString = m_pRtypeCB->text(returnBoxCount); + TQString returnBoxString = m_pRtypeCB->text(returnBoxCount); if ( returnBoxString == m_pOperation->getTypeName() ) { foundReturnType = true; m_pRtypeCB->setCurrentItem(returnBoxCount); @@ -213,7 +213,7 @@ void UMLOperationDialog::setupDialog() { // manage stereotypes m_pStereoTypeCB -> setDuplicatesEnabled(false);//only allow one of each type in box m_pStereoTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup ); - insertStereotype (QString("")); // an empty stereotype is the default + insertStereotype (TQString("")); // an empty stereotype is the default int defaultStereotype=0; bool foundDefaultStereotype = false; for (UMLStereotypeListIt it(m_doc->getStereotypes()); it.current(); ++it) { @@ -232,35 +232,35 @@ void UMLOperationDialog::setupDialog() { m_pStereoTypeCB->setCurrentItem(-1); //setup parm list box signals - connect( m_pUpButton, SIGNAL( clicked() ), this, SLOT( slotParameterUp() ) ); - connect( m_pDownButton, SIGNAL( clicked() ), this, SLOT( slotParameterDown() ) ); + connect( m_pUpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotParameterUp() ) ); + connect( m_pDownButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotParameterDown() ) ); - connect(m_pParmsLB, SIGNAL(clicked(QListBoxItem*)), - this, SLOT(slotParamsBoxClicked(QListBoxItem*))); + connect(m_pParmsLB, TQT_SIGNAL(clicked(TQListBoxItem*)), + this, TQT_SLOT(slotParamsBoxClicked(TQListBoxItem*))); - connect(m_pParmsLB, SIGNAL(rightButtonPressed(QListBoxItem *, const QPoint &)), - this, SLOT(slotParmRightButtonPressed(QListBoxItem *, const QPoint &))); + connect(m_pParmsLB, TQT_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), + this, TQT_SLOT(slotParmRightButtonPressed(TQListBoxItem *, const TQPoint &))); - connect(m_pParmsLB, SIGNAL(rightButtonClicked(QListBoxItem *, const QPoint &)), - this, SLOT(slotParmRightButtonClicked(QListBoxItem *, const QPoint &))); + connect(m_pParmsLB, TQT_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), + this, TQT_SLOT(slotParmRightButtonClicked(TQListBoxItem *, const TQPoint &))); - connect(m_pParmsLB, SIGNAL(doubleClicked(QListBoxItem *)), - this, SLOT(slotParmDoubleClick(QListBoxItem *))); + connect(m_pParmsLB, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), + this, TQT_SLOT(slotParmDoubleClick(TQListBoxItem *))); m_pNameLE->setFocus(); - connect( m_pNameLE, SIGNAL( textChanged ( const QString & ) ), SLOT( slotNameChanged( const QString & ) ) ); + connect( m_pNameLE, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotNameChanged( const TQString & ) ) ); slotNameChanged(m_pNameLE->text() ); } -void UMLOperationDialog::slotNameChanged( const QString &_text ) +void UMLOperationDialog::slotNameChanged( const TQString &_text ) { enableButtonOK( !_text.isEmpty() ); } -void UMLOperationDialog::slotParmRightButtonPressed(QListBoxItem *item, const QPoint &p) { +void UMLOperationDialog::slotParmRightButtonPressed(TQListBoxItem *item, const TQPoint &p) { ListPopupMenu::Menu_Type type = ListPopupMenu::mt_Undefined; if(item)//pressed on an item { @@ -271,26 +271,26 @@ void UMLOperationDialog::slotParmRightButtonPressed(QListBoxItem *item, const QP } if(m_pMenu) { m_pMenu -> hide(); - disconnect(m_pMenu, SIGNAL(activated(int)), this, SLOT(slotParmPopupMenuSel(int))); + disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotParmPopupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } m_pMenu = new ListPopupMenu(this, type); m_pMenu->popup(p); - connect(m_pMenu, SIGNAL(activated(int)), this, SLOT(slotParmPopupMenuSel(int))); + connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotParmPopupMenuSel(int))); } -void UMLOperationDialog::slotParmRightButtonClicked(QListBoxItem */*item*/, const QPoint &/*p*/) { +void UMLOperationDialog::slotParmRightButtonClicked(TQListBoxItem */*item*/, const TQPoint &/*p*/) { if(m_pMenu) { m_pMenu -> hide(); - disconnect(m_pMenu, SIGNAL(activated(int)), this, SLOT(slotParmPopupMenuSel(int))); + disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotParmPopupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } } -void UMLOperationDialog::slotParmDoubleClick(QListBoxItem *item) { +void UMLOperationDialog::slotParmDoubleClick(TQListBoxItem *item) { if(!item) return; slotParmPopupMenuSel(ListPopupMenu::mt_Properties); @@ -311,12 +311,12 @@ void UMLOperationDialog::slotNewParameter() { int result = 0; UMLAttribute* pAtt = 0; - QString currentName = m_pOperation->getUniqueParameterName(); + TQString currentName = m_pOperation->getUniqueParameterName(); UMLAttribute* newAttribute = new UMLAttribute(m_pOperation, currentName, Uml::id_Reserved); ParmPropDlg dlg(this, m_doc, newAttribute); result = dlg.exec(); - QString name = dlg.getName(); + TQString name = dlg.getName(); pAtt = m_pOperation -> findParm( name ); if( result ) { if( name.length() == 0 ) { @@ -369,7 +369,7 @@ void UMLOperationDialog::slotParameterProperties() { }//should never occur ParmPropDlg dlg(this, m_doc, pOldAtt); result = dlg.exec(); - QString name = dlg.getName(); + TQString name = dlg.getName(); pAtt = m_pOperation->findParm( name ); if( result ) { if( name.length() == 0 ) { @@ -381,7 +381,7 @@ void UMLOperationDialog::slotParameterProperties() { pOldAtt->getDoc() != dlg.getDoc() || pOldAtt->getInitialValue() != dlg.getInitialValue() ) { pOldAtt->setName( name ); - QString typeName = dlg.getTypeName(); + TQString typeName = dlg.getTypeName(); if (pOldAtt->getTypeName() != typeName) { UMLClassifierList namesList( m_doc->getConcepts() ); UMLClassifier* obj = NULL; @@ -415,7 +415,7 @@ void UMLOperationDialog::slotParameterUp() UMLAttribute* pOldAtt = m_pOperation->findParm( m_pParmsLB->currentText() ); m_pOperation->moveParmLeft( pOldAtt ); - QString tmp = m_pParmsLB->currentText(); + TQString tmp = m_pParmsLB->currentText(); m_pParmsLB->changeItem( m_pParmsLB->item( m_pParmsLB->currentItem() - 1 )->text(), m_pParmsLB->currentItem() ); m_pParmsLB->changeItem( tmp, m_pParmsLB->currentItem() - 1 ); m_doc->setModified(true); @@ -427,7 +427,7 @@ void UMLOperationDialog::slotParameterDown() UMLAttribute* pOldAtt = m_pOperation->findParm( m_pParmsLB->currentText() ); m_pOperation->moveParmRight( pOldAtt ); - QString tmp = m_pParmsLB->currentText(); + TQString tmp = m_pParmsLB->currentText(); m_pParmsLB->changeItem( m_pParmsLB->item( m_pParmsLB->currentItem() + 1 )->text(), m_pParmsLB->currentItem() ); m_pParmsLB->changeItem( tmp, m_pParmsLB->currentItem() + 1 ); @@ -435,7 +435,7 @@ void UMLOperationDialog::slotParameterDown() slotParamsBoxClicked( m_pParmsLB->selectedItem() ); } -void UMLOperationDialog::slotParamsBoxClicked(QListBoxItem* parameterItem) { +void UMLOperationDialog::slotParamsBoxClicked(TQListBoxItem* parameterItem) { if (parameterItem) { m_pDeleteButton->setEnabled(true); m_pPropertiesButton->setEnabled(true); @@ -451,7 +451,7 @@ void UMLOperationDialog::slotParamsBoxClicked(QListBoxItem* parameterItem) { bool UMLOperationDialog::apply() { - QString name = m_pNameLE -> text(); + TQString name = m_pNameLE -> text(); if( name.length() == 0 ) { KMessageBox::error(this, i18n("You have entered an invalid operation name."), i18n("Operation Name Invalid"), false); @@ -463,9 +463,9 @@ bool UMLOperationDialog::apply() if( classifier != 0L && classifier->checkOperationSignature(name, m_pOperation->getParmList(), m_pOperation) ) { - QString msg = QString(i18n("An operation with that signature already exists in %1.\n")).arg(classifier->getName()) + TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).arg(classifier->getName()) + - QString(i18n("Choose a different name or parameter list." )); + TQString(i18n("Choose a different name or parameter list." )); KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false); return false; } @@ -480,7 +480,7 @@ bool UMLOperationDialog::apply() else if (m_pImplementationRB -> isChecked() ) m_pOperation -> setVisibility( Uml::Visibility::Implementation ); - QString typeName = m_pRtypeCB->currentText(); + TQString typeName = m_pRtypeCB->currentText(); UMLTemplate *tmplParam = classifier->findTemplate(typeName); if (tmplParam) m_pOperation->setType(tmplParam); @@ -515,13 +515,13 @@ void UMLOperationDialog::slotOk() { } } -void UMLOperationDialog::insertType( const QString& type, int index ) +void UMLOperationDialog::insertType( const TQString& type, int index ) { m_pRtypeCB->insertItem( type, index ); m_pRtypeCB->completionObject()->addItem( type ); } -void UMLOperationDialog::insertStereotype( const QString& type, int index ) +void UMLOperationDialog::insertStereotype( const TQString& type, int index ) { m_pStereoTypeCB->insertItem( type, index ); m_pStereoTypeCB->completionObject()->addItem( type ); diff --git a/umbrello/umbrello/dialogs/umloperationdialog.h b/umbrello/umbrello/dialogs/umloperationdialog.h index 1dee99ab..5d6d8ef9 100644 --- a/umbrello/umbrello/dialogs/umloperationdialog.h +++ b/umbrello/umbrello/dialogs/umloperationdialog.h @@ -42,7 +42,7 @@ public: /** * Constructor */ - UMLOperationDialog( QWidget * parent, UMLOperation * pOperation ); + UMLOperationDialog( TQWidget * parent, UMLOperation * pOperation ); /** * Deconstructor @@ -64,7 +64,7 @@ protected: /** * Inserts @p type into the type-combobox as well as its completion object. */ - void insertType( const QString& type, int index = -1 ); + void insertType( const TQString& type, int index = -1 ); /** * The operation to represent. @@ -84,28 +84,28 @@ protected: /** * Inserts @p stereotype into the stereotype-combobox as well as its completion object. */ - void insertStereotype( const QString& type, int index = -1 ); + void insertStereotype( const TQString& type, int index = -1 ); //GUI widgets - QGroupBox * m_pParmsGB, * m_pGenGB; - QListBox * m_pParmsLB; - QButtonGroup * m_pScopeBG; - QRadioButton * m_pPublicRB, * m_pPrivateRB, * m_pProtectedRB, *m_pImplementationRB; - QLabel * m_pRtypeL, * m_pNameL, * m_pStereoTypeL; + TQGroupBox * m_pParmsGB, * m_pGenGB; + TQListBox * m_pParmsLB; + TQButtonGroup * m_pScopeBG; + TQRadioButton * m_pPublicRB, * m_pPrivateRB, * m_pProtectedRB, *m_pImplementationRB; + TQLabel * m_pRtypeL, * m_pNameL, * m_pStereoTypeL; KComboBox * m_pRtypeCB, * m_pStereoTypeCB; - QLineEdit * m_pNameLE; - QCheckBox * m_pAbstractCB; - QCheckBox * m_pStaticCB; - QCheckBox * m_pQueryCB; - QPushButton* m_pDeleteButton; - QPushButton* m_pPropertiesButton; + TQLineEdit * m_pNameLE; + TQCheckBox * m_pAbstractCB; + TQCheckBox * m_pStaticCB; + TQCheckBox * m_pQueryCB; + TQPushButton* m_pDeleteButton; + TQPushButton* m_pPropertiesButton; KArrowButton* m_pUpButton; KArrowButton* m_pDownButton; public slots: - void slotParmRightButtonPressed(QListBoxItem *item, const QPoint &p); - void slotParmRightButtonClicked(QListBoxItem *item, const QPoint &p); - void slotParmDoubleClick(QListBoxItem *item); + void slotParmRightButtonPressed(TQListBoxItem *item, const TQPoint &p); + void slotParmRightButtonClicked(TQListBoxItem *item, const TQPoint &p); + void slotParmDoubleClick(TQListBoxItem *item); void slotParmPopupMenuSel(int id); void slotNewParameter(); void slotDeleteParameter(); @@ -116,7 +116,7 @@ public slots: /** * enables or disables buttons */ - void slotParamsBoxClicked(QListBoxItem* parameterItem); + void slotParamsBoxClicked(TQListBoxItem* parameterItem); /** * I don't think this is used, but if we had an apply button @@ -128,7 +128,7 @@ public slots: * Used when the OK button is clicked. Calls apply() */ void slotOk(); - void slotNameChanged( const QString & ); + void slotNameChanged( const TQString & ); }; diff --git a/umbrello/umbrello/dialogs/umlroledialog.cpp b/umbrello/umbrello/dialogs/umlroledialog.cpp index 91ad5c65..255f4010 100644 --- a/umbrello/umbrello/dialogs/umlroledialog.cpp +++ b/umbrello/umbrello/dialogs/umlroledialog.cpp @@ -13,7 +13,7 @@ #include "umlroledialog.h" // qt/kde includes -#include <qlayout.h> +#include <tqlayout.h> #include <kdebug.h> #include <klocale.h> @@ -21,7 +21,7 @@ #include "../umlrole.h" #include "umlroleproperties.h" -UMLRoleDialog::UMLRoleDialog( QWidget * parent, UMLRole * pRole ) +UMLRoleDialog::UMLRoleDialog( TQWidget * parent, UMLRole * pRole ) : KDialogBase( Plain, i18n("Role Properties"), Help | Ok | Cancel , Ok, parent, "_UMLROLEDLG_", true, true) { m_pRole = pRole; @@ -31,11 +31,11 @@ UMLRoleDialog::UMLRoleDialog( QWidget * parent, UMLRole * pRole ) UMLRoleDialog::~UMLRoleDialog() {} void UMLRoleDialog::setupDialog() { - // UMLRoleDialogLayout = new QGridLayout( this, 1, 1, 11, 6, "UMLRoleLayout"); + // UMLRoleDialogLayout = new TQGridLayout( this, 1, 1, 11, 6, "UMLRoleLayout"); m_pRoleProps = new UMLRoleProperties(this, m_pRole); setMainWidget( m_pRoleProps ); - resize( QSize(425, 620).expandedTo(minimumSizeHint()) ); + resize( TQSize(425, 620).expandedTo(minimumSizeHint()) ); // topLayout -> addWidget( m_pParmsGB); diff --git a/umbrello/umbrello/dialogs/umlroledialog.h b/umbrello/umbrello/dialogs/umlroledialog.h index 09856d34..9f1ab218 100644 --- a/umbrello/umbrello/dialogs/umlroledialog.h +++ b/umbrello/umbrello/dialogs/umlroledialog.h @@ -29,7 +29,7 @@ public: /** * Constructor */ - UMLRoleDialog( QWidget * parent, UMLRole * pRole ); + UMLRoleDialog( TQWidget * parent, UMLRole * pRole ); /** * Deconstructor diff --git a/umbrello/umbrello/dialogs/umlroleproperties.cpp b/umbrello/umbrello/dialogs/umlroleproperties.cpp index 275d98f1..fe2e2f5f 100644 --- a/umbrello/umbrello/dialogs/umlroleproperties.cpp +++ b/umbrello/umbrello/dialogs/umlroleproperties.cpp @@ -13,15 +13,15 @@ #include "umlroleproperties.h" // qt/kde includes -#include <qradiobutton.h> -#include <qtextedit.h> -#include <qlineedit.h> +#include <tqradiobutton.h> +#include <tqtextedit.h> +#include <tqlineedit.h> #include <klocale.h> #include <kmessagebox.h> #include <kdebug.h> -UMLRoleProperties::UMLRoleProperties ( QWidget *parent, UMLRole *role) +UMLRoleProperties::UMLRoleProperties ( TQWidget *parent, UMLRole *role) : UMLRolePropertiesBase (parent) { @@ -66,7 +66,7 @@ void UMLRoleProperties::constructWidget() { // Documentation // m_pDocTE-> setText(m_pRole-> getDoc()); - //m_pDocTE->setWordWrap(QMultiLineEdit::WidgetWidth); + //m_pDocTE->setWordWrap(TQMultiLineEdit::WidgetWidth); } void UMLRoleProperties::updateObject() { diff --git a/umbrello/umbrello/dialogs/umlroleproperties.h b/umbrello/umbrello/dialogs/umlroleproperties.h index 34f7d3e9..61b7b8fe 100644 --- a/umbrello/umbrello/dialogs/umlroleproperties.h +++ b/umbrello/umbrello/dialogs/umlroleproperties.h @@ -32,7 +32,7 @@ public: * @param parent The parent widget to the UMLRoleProperties. * @param role The UMLRole to display the properties of. */ - UMLRoleProperties( QWidget *parent, UMLRole *role); + UMLRoleProperties( TQWidget *parent, UMLRole *role); /** * Standard deconstructor. diff --git a/umbrello/umbrello/dialogs/umltemplatedialog.cpp b/umbrello/umbrello/dialogs/umltemplatedialog.cpp index a183d95d..6075fbe4 100644 --- a/umbrello/umbrello/dialogs/umltemplatedialog.cpp +++ b/umbrello/umbrello/dialogs/umltemplatedialog.cpp @@ -13,11 +13,11 @@ #include "umltemplatedialog.h" // qt includes -#include <qlayout.h> -#include <qgroupbox.h> -#include <qcombobox.h> -#include <qlabel.h> -#include <qlineedit.h> +#include <tqlayout.h> +#include <tqgroupbox.h> +#include <tqcombobox.h> +#include <tqlabel.h> +#include <tqlineedit.h> // kde includes #include <kcombobox.h> @@ -32,7 +32,7 @@ #include "../uml.h" #include "../dialog_utils.h" -UMLTemplateDialog::UMLTemplateDialog(QWidget* pParent, UMLTemplate* pTemplate) +UMLTemplateDialog::UMLTemplateDialog(TQWidget* pParent, UMLTemplate* pTemplate) : KDialogBase( Plain, i18n("Template Properties"), Help | Ok | Cancel , Ok, pParent, "_UMLTemplateDLG_", true, true) { m_pTemplate = pTemplate; setupDialog(); @@ -43,14 +43,14 @@ UMLTemplateDialog::~UMLTemplateDialog() {} void UMLTemplateDialog::setupDialog() { int margin = fontMetrics().height(); - QVBoxLayout* mainLayout = new QVBoxLayout( plainPage() ); + TQVBoxLayout* mainLayout = new TQVBoxLayout( plainPage() ); - m_pValuesGB = new QGroupBox(i18n("General Properties"), plainPage() ); - QGridLayout* valuesLayout = new QGridLayout(m_pValuesGB, 3, 2); + m_pValuesGB = new TQGroupBox(i18n("General Properties"), plainPage() ); + TQGridLayout* valuesLayout = new TQGridLayout(m_pValuesGB, 3, 2); valuesLayout->setMargin(margin); valuesLayout->setSpacing(10); - m_pTypeL = new QLabel(i18n("&Type:"), m_pValuesGB); + m_pTypeL = new TQLabel(i18n("&Type:"), m_pValuesGB); valuesLayout->addWidget(m_pTypeL, 0, 0); m_pTypeCB = new KComboBox(m_pValuesGB); @@ -86,7 +86,7 @@ void UMLTemplateDialog::setupDialog() { int typeBoxCount = 0; bool foundType = false; while (typeBoxCount < m_pTypeCB->count() && foundType == false) { - QString typeBoxString = m_pTypeCB->text(typeBoxCount); + TQString typeBoxString = m_pTypeCB->text(typeBoxCount); if ( typeBoxString == m_pTemplate->getTypeName() ) { foundType = true; m_pTypeCB->setCurrentItem(typeBoxCount); @@ -103,14 +103,14 @@ void UMLTemplateDialog::setupDialog() { m_pNameLE->setFocus(); } -void UMLTemplateDialog::insertType( const QString& type, int index ) +void UMLTemplateDialog::insertType( const TQString& type, int index ) { m_pTypeCB->insertItem( type, index ); m_pTypeCB->completionObject()->addItem( type ); } bool UMLTemplateDialog::apply() { - QString typeName = m_pTypeCB->currentText(); + TQString typeName = m_pTypeCB->currentText(); UMLDoc *pDoc = UMLApp::app()->getDocument(); UMLClassifierList namesList( pDoc->getConcepts() ); UMLClassifier* obj = 0; @@ -123,7 +123,7 @@ bool UMLTemplateDialog::apply() { // FIXME: This implementation is not good yet. m_pTemplate->setTypeName( typeName ); } - QString name = m_pNameLE->text(); + TQString name = m_pNameLE->text(); if( name.length() == 0 ) { KMessageBox::error(this, i18n("You have entered an invalid template name."), i18n("Template Name Invalid"), false); diff --git a/umbrello/umbrello/dialogs/umltemplatedialog.h b/umbrello/umbrello/dialogs/umltemplatedialog.h index 3bdd321b..4ed1d584 100644 --- a/umbrello/umbrello/dialogs/umltemplatedialog.h +++ b/umbrello/umbrello/dialogs/umltemplatedialog.h @@ -32,7 +32,7 @@ class UMLTemplate; class UMLTemplateDialog : public KDialogBase { Q_OBJECT public: - UMLTemplateDialog(QWidget* pParent, UMLTemplate* pAttribute); + UMLTemplateDialog(TQWidget* pParent, UMLTemplate* pAttribute); ~UMLTemplateDialog(); protected: @@ -53,11 +53,11 @@ protected: UMLTemplate* m_pTemplate; //GUI Widgets - QGroupBox* m_pTemplateGB; - QGroupBox* m_pValuesGB; - QLabel *m_pTypeL, *m_pNameL, *m_pStereoTypeL; + TQGroupBox* m_pTemplateGB; + TQGroupBox* m_pValuesGB; + TQLabel *m_pTypeL, *m_pNameL, *m_pStereoTypeL; KComboBox* m_pTypeCB; - QLineEdit *m_pNameLE, *m_pStereoTypeLE; + TQLineEdit *m_pNameLE, *m_pStereoTypeLE; public slots: /** @@ -74,7 +74,7 @@ protected: /** * Inserts @p type into the type-combobox as well as its completion object. */ - void insertType( const QString& type, int index = -1 ); + void insertType( const TQString& type, int index = -1 ); }; diff --git a/umbrello/umbrello/dialogs/umlviewdialog.cpp b/umbrello/umbrello/dialogs/umlviewdialog.cpp index 94f44059..76ef776d 100644 --- a/umbrello/umbrello/dialogs/umlviewdialog.cpp +++ b/umbrello/umbrello/dialogs/umlviewdialog.cpp @@ -13,14 +13,14 @@ #include "umlviewdialog.h" // qt/kde includes -#include <qvbox.h> -#include <qlayout.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qgroupbox.h> -#include <qtextedit.h> -#include <qspinbox.h> +#include <tqvbox.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqgroupbox.h> +#include <tqtextedit.h> +#include <tqspinbox.h> #include <kiconloader.h> #include <klocale.h> #include <kmessagebox.h> @@ -35,7 +35,7 @@ #include "diagrampropertiespage.h" -UMLViewDialog::UMLViewDialog( QWidget * pParent, UMLView * pView ) : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help, +UMLViewDialog::UMLViewDialog( TQWidget * pParent, UMLView * pView ) : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help, Ok, pParent, "_VIEWDLG_", true, true) { m_pView = pView; m_options = m_pView -> getOptionState(); @@ -67,7 +67,7 @@ void UMLViewDialog::setupPages() void UMLViewDialog::setupDiagramPropertiesPage() { - QVBox *page = addVBoxPage( i18n("General"), i18n("General Settings"), DesktopIcon( "misc") ); + TQVBox *page = addVBoxPage( i18n("General"), i18n("General Settings"), DesktopIcon( "misc") ); m_diagramProperties = new DiagramPropertiesPage(page); m_diagramProperties->diagramName->setText( m_pView->getName() ); @@ -90,22 +90,22 @@ void UMLViewDialog::setupClassPage() { return; } - QFrame * newPage = addPage( i18n("Display"), i18n("Classes Display Options"), DesktopIcon( "info") ); - QHBoxLayout * m_pOptionsLayout = new QHBoxLayout( newPage ); + TQFrame * newPage = addPage( i18n("Display"), i18n("Classes Display Options"), DesktopIcon( "info") ); + TQHBoxLayout * m_pOptionsLayout = new TQHBoxLayout( newPage ); m_pOptionsPage = new ClassOptionsPage( newPage, &m_options ); m_pOptionsLayout -> addWidget( m_pOptionsPage ); } void UMLViewDialog::setupColorPage() { - QFrame * colorPage = addPage( i18n("Color"), i18n("Diagram Colors"), DesktopIcon( "colors") ); - QHBoxLayout * m_pColorLayout = new QHBoxLayout(colorPage); + TQFrame * colorPage = addPage( i18n("Color"), i18n("Diagram Colors"), DesktopIcon( "colors") ); + TQHBoxLayout * m_pColorLayout = new TQHBoxLayout(colorPage); m_pColorPage = new UMLWidgetColorPage( colorPage, &m_options ); m_pColorLayout -> addWidget(m_pColorPage); } void UMLViewDialog::setupFontPage() { - QVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts") ); - m_pChooser = new KFontChooser( (QWidget*)page, "font", false, QStringList(), false); + TQVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts") ); + m_pChooser = new KFontChooser( (TQWidget*)page, "font", false, TQStringList(), false); m_pChooser -> setFont( m_pView -> getOptionState().uiState.font ); } @@ -157,7 +157,7 @@ void UMLViewDialog::applyPage( Page page ) { } void UMLViewDialog::checkName() { - QString name = m_diagramProperties->diagramName-> text(); + TQString name = m_diagramProperties->diagramName-> text(); UMLDoc * pDoc = UMLApp::app()-> getDocument(); UMLView * pView = pDoc -> findView( m_pView -> getType(), name ); if( name.length() == 0 ) { diff --git a/umbrello/umbrello/dialogs/umlviewdialog.h b/umbrello/umbrello/dialogs/umlviewdialog.h index b6fe4ebd..1a72c076 100644 --- a/umbrello/umbrello/dialogs/umlviewdialog.h +++ b/umbrello/umbrello/dialogs/umlviewdialog.h @@ -41,7 +41,7 @@ public: /** * Constructor */ - UMLViewDialog( QWidget * pParent, UMLView * pView ); + UMLViewDialog( TQWidget * pParent, UMLView * pView ); /** * Deconstructor @@ -104,13 +104,13 @@ protected: UMLWidgetColorPage * m_pColorPage; //GUI widgets - QLabel * m_pNameL, * m_pSpinXL, * m_pSpinYL; - QLineEdit * m_pNameLE; - QGroupBox * m_pDocGB, * m_pValuesGB; - QCheckBox * m_pSnapToGridCB, * m_pShowSnapCB; - QTextEdit * m_pDocTE; - QSpinBox * m_pSnapXSB, * m_pSnapYSB; - QSpinBox * m_pLineWidthSB; + TQLabel * m_pNameL, * m_pSpinXL, * m_pSpinYL; + TQLineEdit * m_pNameLE; + TQGroupBox * m_pDocGB, * m_pValuesGB; + TQCheckBox * m_pSnapToGridCB, * m_pShowSnapCB; + TQTextEdit * m_pDocTE; + TQSpinBox * m_pSnapXSB, * m_pSnapYSB; + TQSpinBox * m_pLineWidthSB; public slots: void slotOk(); void slotApply(); diff --git a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp index e234a8c2..824d708f 100644 --- a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp +++ b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp @@ -14,15 +14,15 @@ #include "../umlview.h" #include "../umlwidget.h" #include <klocale.h> -#include <qlayout.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qcheckbox.h> +#include <tqlayout.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> #include <kcolorbutton.h> -UMLWidgetColorPage::UMLWidgetColorPage( QWidget *pParent, UMLWidget *pWidget ) : QWidget( pParent ) +UMLWidgetColorPage::UMLWidgetColorPage( TQWidget *pParent, UMLWidget *pWidget ) : TQWidget( pParent ) { m_pUMLWidget = pWidget; m_options = 0; @@ -32,7 +32,7 @@ UMLWidgetColorPage::UMLWidgetColorPage( QWidget *pParent, UMLWidget *pWidget ) : m_pUseFillColorCB->setChecked( pWidget -> getUseFillColour() ); } -UMLWidgetColorPage::UMLWidgetColorPage( QWidget * pParent, Settings::OptionState *options ) : QWidget( pParent ) +UMLWidgetColorPage::UMLWidgetColorPage( TQWidget * pParent, Settings::OptionState *options ) : TQWidget( pParent ) { m_options = options; m_pUMLWidget = 0; @@ -47,41 +47,41 @@ void UMLWidgetColorPage::init() int margin = fontMetrics().height(); //setup GUI - QVBoxLayout * topLayout = new QVBoxLayout( this ); + TQVBoxLayout * topLayout = new TQVBoxLayout( this ); topLayout -> setSpacing( 6 ); - m_pColorGB = new QGroupBox( i18n( "Color" ), this ); + m_pColorGB = new TQGroupBox( i18n( "Color" ), this ); topLayout -> addWidget( m_pColorGB ); - QGridLayout * colorLayout = new QGridLayout( m_pColorGB, 3, 3 ); + TQGridLayout * colorLayout = new TQGridLayout( m_pColorGB, 3, 3 ); colorLayout -> setMargin( margin ); - m_pLineColorL = new QLabel( i18n( "&Line:" ), m_pColorGB ); + m_pLineColorL = new TQLabel( i18n( "&Line:" ), m_pColorGB ); colorLayout -> addWidget( m_pLineColorL, 0, 0 ); m_pLineColorB = new KColorButton( m_pColorGB ); colorLayout -> addWidget( m_pLineColorB, 0, 1 ); m_pLineColorL->setBuddy(m_pLineColorB); - m_pLineDefaultB = new QPushButton( i18n( "&Default" ), m_pColorGB) ; + m_pLineDefaultB = new TQPushButton( i18n( "&Default" ), m_pColorGB) ; colorLayout -> addWidget( m_pLineDefaultB, 0, 2 ); - m_pFillColorL = new QLabel( i18n( "&Fill:" ), m_pColorGB ); + m_pFillColorL = new TQLabel( i18n( "&Fill:" ), m_pColorGB ); colorLayout -> addWidget( m_pFillColorL, 1, 0 ); m_pFillColorB = new KColorButton( m_pColorGB ); colorLayout -> addWidget( m_pFillColorB, 1, 1 ); m_pFillColorL->setBuddy(m_pFillColorB); - m_pFillDefaultB = new QPushButton( i18n( "D&efault" ), m_pColorGB ); + m_pFillDefaultB = new TQPushButton( i18n( "D&efault" ), m_pColorGB ); colorLayout -> addWidget( m_pFillDefaultB, 1, 2 ); - m_pUseFillColorCB = new QCheckBox( i18n( "&Use fill" ), m_pColorGB ); + m_pUseFillColorCB = new TQCheckBox( i18n( "&Use fill" ), m_pColorGB ); colorLayout -> setRowStretch( 2, 2 ); colorLayout -> addWidget( m_pUseFillColorCB, 2, 0 ); //connect button signals up - connect( m_pLineDefaultB, SIGNAL( clicked() ), this, SLOT( slotLineButtonClicked() )) ; - connect( m_pFillDefaultB, SIGNAL( clicked() ), this, SLOT( slotFillButtonClicked() ) ); + connect( m_pLineDefaultB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotLineButtonClicked() )) ; + connect( m_pFillDefaultB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotFillButtonClicked() ) ); } UMLWidgetColorPage::~UMLWidgetColorPage() {} diff --git a/umbrello/umbrello/dialogs/umlwidgetcolorpage.h b/umbrello/umbrello/dialogs/umlwidgetcolorpage.h index 45826338..419868da 100644 --- a/umbrello/umbrello/dialogs/umlwidgetcolorpage.h +++ b/umbrello/umbrello/dialogs/umlwidgetcolorpage.h @@ -12,7 +12,7 @@ #ifndef UMLWIDGETCOLORPAGE_H #define UMLWIDGETCOLORPAGE_H -#include <qwidget.h> +#include <tqwidget.h> #include "../optionstate.h" /** @@ -27,19 +27,19 @@ class QPushButton; class QCheckBox; class QGroupBox; -class UMLWidgetColorPage : public QWidget { +class UMLWidgetColorPage : public TQWidget { Q_OBJECT public: /** * Constructor - Observe a UMLWidget */ - UMLWidgetColorPage( QWidget * pParent, UMLWidget * pWidget ); + UMLWidgetColorPage( TQWidget * pParent, UMLWidget * pWidget ); /** * Constructor - Observe an OptionState structure */ - UMLWidgetColorPage( QWidget * pParent, Settings::OptionState *options ); + UMLWidgetColorPage( TQWidget * pParent, Settings::OptionState *options ); /** * destructor @@ -73,10 +73,10 @@ protected: Settings::OptionState *m_options; //GUI widgets - QGroupBox * m_pColorGB; - QLabel * m_pLineColorL, * m_pFillColorL; - QCheckBox * m_pUseFillColorCB; - QPushButton * m_pLineDefaultB, * m_pFillDefaultB; + TQGroupBox * m_pColorGB; + TQLabel * m_pLineColorL, * m_pFillColorL; + TQCheckBox * m_pUseFillColorCB; + TQPushButton * m_pLineDefaultB, * m_pFillDefaultB; KColorButton * m_pLineColorB, * m_pFillColorB; private: void init(); |