From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 14 Jun 2011 16:45:05 +0000 Subject: TQt4 port kdevelop This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- parts/classview/classtooldlg.cpp | 70 +++++++++++++++---------------- parts/classview/classtooldlg.h | 15 +++---- parts/classview/classtoolwidget.cpp | 36 ++++++++-------- parts/classview/classtoolwidget.h | 5 ++- parts/classview/classtreebase.cpp | 46 ++++++++++----------- parts/classview/classtreebase.h | 43 +++++++++---------- parts/classview/classviewpart.cpp | 20 ++++----- parts/classview/classviewpart.h | 3 +- parts/classview/classviewwidget.cpp | 82 ++++++++++++++++++------------------- parts/classview/classviewwidget.h | 59 +++++++++++++------------- parts/classview/digraphview.cpp | 16 ++++---- parts/classview/digraphview.h | 7 ++-- parts/classview/hierarchydlg.cpp | 20 ++++----- parts/classview/hierarchydlg.h | 3 +- parts/classview/navigator.cpp | 24 +++++------ parts/classview/navigator.h | 5 ++- parts/classview/viewcombos.cpp | 24 +++++------ parts/classview/viewcombos.h | 18 ++++---- 18 files changed, 252 insertions(+), 244 deletions(-) (limited to 'parts/classview') diff --git a/parts/classview/classtooldlg.cpp b/parts/classview/classtooldlg.cpp index df51f6f4..70e26439 100644 --- a/parts/classview/classtooldlg.cpp +++ b/parts/classview/classtooldlg.cpp @@ -38,40 +38,40 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part ) TQPushButton *close_button = new KPushButton(KStdGuiItem::close(), this); - parents_button = new TQToolButton(this); - parents_button->setPixmap( UserIcon("CTparents", KIcon::DefaultState, ClassViewFactory::instance()) ); - parents_button->setToggleButton(true); - parents_button->setFixedSize(parents_button->sizeHint()); - TQToolTip::add(parents_button, i18n("Show parents")); - - children_button = new TQToolButton(this); - children_button->setPixmap( UserIcon("CTchildren", KIcon::DefaultState, ClassViewFactory::instance()) ); - children_button->setToggleButton(true); - children_button->setFixedSize(children_button->sizeHint()); - TQToolTip::add(children_button, i18n("Show children")); + tqparents_button = new TQToolButton(this); + tqparents_button->setPixmap( UserIcon("CTtqparents", KIcon::DefaultState, ClassViewFactory::instance()) ); + tqparents_button->setToggleButton(true); + tqparents_button->setFixedSize(tqparents_button->tqsizeHint()); + TQToolTip::add(tqparents_button, i18n("Show tqparents")); + + tqchildren_button = new TQToolButton(this); + tqchildren_button->setPixmap( UserIcon("CTtqchildren", KIcon::DefaultState, ClassViewFactory::instance()) ); + tqchildren_button->setToggleButton(true); + tqchildren_button->setFixedSize(tqchildren_button->tqsizeHint()); + TQToolTip::add(tqchildren_button, i18n("Show tqchildren")); clients_button = new TQToolButton(this); clients_button->setPixmap( UserIcon("CTclients", KIcon::DefaultState, ClassViewFactory::instance()) ); clients_button->setToggleButton(true); - clients_button->setFixedSize(clients_button->sizeHint()); + clients_button->setFixedSize(clients_button->tqsizeHint()); TQToolTip::add(clients_button, i18n("Show clients")); suppliers_button = new TQToolButton(this); suppliers_button->setPixmap( UserIcon("CTsuppliers", KIcon::DefaultState, ClassViewFactory::instance()) ); suppliers_button->setToggleButton(true); - suppliers_button->setFixedSize(suppliers_button->sizeHint()); + suppliers_button->setFixedSize(suppliers_button->tqsizeHint()); TQToolTip::add(suppliers_button, i18n("Show suppliers")); methods_button = new TQToolButton(this); methods_button->setPixmap( UserIcon("CVpublic_meth", KIcon::DefaultState, ClassViewFactory::instance()) ); methods_button->setToggleButton(true); - methods_button->setFixedSize(methods_button->sizeHint()); + methods_button->setFixedSize(methods_button->tqsizeHint()); TQToolTip::add(methods_button, i18n("Show methods")); attributes_button = new TQToolButton(this); attributes_button->setPixmap( UserIcon("CVpublic_var", KIcon::DefaultState, ClassViewFactory::instance()) ); attributes_button->setToggleButton(true); - attributes_button->setFixedSize(attributes_button->sizeHint()); + attributes_button->setFixedSize(attributes_button->tqsizeHint()); TQToolTip::add(attributes_button, i18n("Show attributes")); access_combo = new TQComboBox(false, this, "access combo"); @@ -86,17 +86,17 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part ) class_tree = new ClassToolWidget(part, this); // classTree->setMinimumSize( 500, 400 ); - TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); TQHBoxLayout *firstrowLayout = new TQHBoxLayout(); TQHBoxLayout *secondrowLayout = new TQHBoxLayout(); - layout->addLayout(firstrowLayout); - layout->addLayout(secondrowLayout); + tqlayout->addLayout(firstrowLayout); + tqlayout->addLayout(secondrowLayout); firstrowLayout->addWidget(class_combo, 1); firstrowLayout->addWidget(close_button, 0); - secondrowLayout->addWidget(parents_button); - secondrowLayout->addWidget(children_button); + secondrowLayout->addWidget(tqparents_button); + secondrowLayout->addWidget(tqchildren_button); secondrowLayout->addWidget(clients_button); secondrowLayout->addWidget(suppliers_button); secondrowLayout->addStretch(); @@ -104,7 +104,7 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part ) secondrowLayout->addWidget(attributes_button); secondrowLayout->addWidget(access_combo); - layout->addWidget(class_tree, 10); + tqlayout->addWidget(class_tree, 10); connect( class_combo, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotClassComboChoice(const TQString&)) ); @@ -112,8 +112,8 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part ) this, TQT_SLOT(slotClose()) ); connect( access_combo, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotAccessComboChoice(const TQString&)) ); - connect( parents_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewParents())); - connect( children_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewChildren())); + connect( tqparents_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewParents())); + connect( tqchildren_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewChildren())); connect( clients_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewClients())); connect( suppliers_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewSuppliers())); connect( methods_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewMethods())); @@ -170,7 +170,7 @@ void ClassToolDialog::viewNone() } -/** View the parents of the current class. */ +/** View the tqparents of the current class. */ void ClassToolDialog::viewParents() { currentOperation = ViewParents; @@ -178,7 +178,7 @@ void ClassToolDialog::viewParents() } -/** View the children of the current class. */ +/** View the tqchildren of the current class. */ void ClassToolDialog::viewChildren() { currentOperation = ViewChildren; @@ -202,7 +202,7 @@ void ClassToolDialog::viewSuppliers() } -/** View methods in this class and parents. */ +/** View methods in this class and tqparents. */ void ClassToolDialog::viewMethods() { currentOperation = ViewMethods; @@ -210,7 +210,7 @@ void ClassToolDialog::viewMethods() } -/** View attributes in this class and parents. */ +/** View attributes in this class and tqparents. */ void ClassToolDialog::viewAttributes() { currentOperation = ViewAttributes; @@ -283,11 +283,11 @@ void ClassToolDialog::updateCaptionAndButtons() switch (currentOperation) { case ViewParents: - button = parents_button; + button = tqparents_button; caption = i18n("Parents"); break; case ViewChildren: - button = children_button; + button = tqchildren_button; caption = i18n("Children"); break; case ViewClients: @@ -300,11 +300,11 @@ void ClassToolDialog::updateCaptionAndButtons() break; case ViewMethods: button = methods_button; - caption = i18n("%1 Methods").arg(access_combo->currentText()); + caption = i18n("%1 Methods").tqarg(access_combo->currentText()); break; case ViewAttributes: button = attributes_button; - caption = i18n("%1 Attributes").arg(access_combo->currentText()); + caption = i18n("%1 Attributes").tqarg(access_combo->currentText()); break; default: button = 0; @@ -312,8 +312,8 @@ void ClassToolDialog::updateCaptionAndButtons() break; } - parents_button->setOn(false); - children_button->setOn(false); + tqparents_button->setOn(false); + tqchildren_button->setOn(false); clients_button->setOn(false); suppliers_button->setOn(false); methods_button->setOn(false); @@ -321,7 +321,7 @@ void ClassToolDialog::updateCaptionAndButtons() if (button) { button->setOn(true); - setCaption(i18n("%1 of Class %2").arg(caption).arg(currentClass->name())); + setCaption(i18n("%1 of Class %2").tqarg(caption).tqarg(currentClass->name())); } else setCaption(caption); } @@ -339,7 +339,7 @@ void ClassToolDialog::buildTree() switch (currentOperation) { case ViewParents: - class_tree->insertClassAndClasses(currentClass, currentClass->parents); + class_tree->insertClassAndClasses(currentClass, currentClass->tqparents); break; case ViewChildren: { diff --git a/parts/classview/classtooldlg.h b/parts/classview/classtooldlg.h index 01c86f3b..a33c7f2b 100644 --- a/parts/classview/classtooldlg.h +++ b/parts/classview/classtooldlg.h @@ -27,9 +27,10 @@ class ClassStore; class ParsedClass; -class ClassToolDialog : public QWidget +class ClassToolDialog : public TQWidget { Q_OBJECT + TQ_OBJECT public: enum Operations { ViewParents, ViewChildren, ViewClients, ViewSuppliers, @@ -44,17 +45,17 @@ public slots: /** View nothing. */ void viewNone(); - /** View the parents of the current class. */ + /** View the tqparents of the current class. */ void viewParents(); - /** View the children of the current class. */ + /** View the tqchildren of the current class. */ void viewChildren(); /** View all classes that has this class as an attribute. */ void viewClients(); /** View all classes that this class has as attributes. */ void viewSuppliers(); - /** View methods in this class and parents. */ + /** View methods in this class and tqparents. */ void viewMethods(); - /** View attributes in this class and parents. */ + /** View attributes in this class and tqparents. */ void viewAttributes(); private slots: @@ -74,8 +75,8 @@ private: ClassToolWidget *class_tree; TQComboBox *class_combo; - TQToolButton *parents_button; - TQToolButton *children_button; + TQToolButton *tqparents_button; + TQToolButton *tqchildren_button; TQToolButton *clients_button; TQToolButton *suppliers_button; TQToolButton *methods_button; diff --git a/parts/classview/classtoolwidget.cpp b/parts/classview/classtoolwidget.cpp index 5aefe6e5..59e744f1 100644 --- a/parts/classview/classtoolwidget.cpp +++ b/parts/classview/classtoolwidget.cpp @@ -20,8 +20,8 @@ #include "classstore.h" -ClassToolWidget::ClassToolWidget(ClassViewPart *part, TQWidget *parent) - : ClassTreeBase(part, parent, "class tool widget") +ClassToolWidget::ClassToolWidget(ClassViewPart *part, TQWidget *tqparent) + : ClassTreeBase(part, tqparent, "class tool widget") {} @@ -60,16 +60,16 @@ void ClassToolWidget::insertClassAndClasses(ParsedClass *parsedClass, TQValueLis } -void ClassToolWidget::insertClassAndClasses(ParsedClass *parsedClass, const TQPtrList &parentList) +void ClassToolWidget::insertClassAndClasses(ParsedClass *parsedClass, const TQPtrList &tqparentList) { ClassTreeItem *root = new ClassTreeClassItem(this, 0, parsedClass); ClassTreeItem *lastItem = 0; - TQPtrListIterator it(parentList); + TQPtrListIterator it(tqparentList); for (; it.current(); ++it) { - ParsedClass *parentClass = m_part->classStore()->getClassByName((*it)->name()); - lastItem = new ClassTreeClassItem(root, lastItem, parentClass); + ParsedClass *tqparentClass = m_part->classStore()->getClassByName((*it)->name()); + lastItem = new ClassTreeClassItem(root, lastItem, tqparentClass); lastItem->setExpandable(false); } @@ -124,14 +124,14 @@ void ClassToolWidget::insertAllClassMethods(ParsedClass *parsedClass, PIAccess f { ClassTreeItem *lastItem = 0; - // First treat all parents. - for ( ParsedParent *pParent = parsedClass->parents.first(); + // First treat all tqparents. + for ( ParsedParent *pParent = parsedClass->tqparents.first(); pParent != 0; - pParent = parsedClass->parents.next() ) + pParent = parsedClass->tqparents.next() ) { - ParsedClass *parentClass = m_part->classStore()->getClassByName(pParent->name()); - if (parentClass) - addClassAndMethods(parentClass, filter, &lastItem); + ParsedClass *tqparentClass = m_part->classStore()->getClassByName(pParent->name()); + if (tqparentClass) + addClassAndMethods(tqparentClass, filter, &lastItem); } // Add the current class @@ -142,14 +142,14 @@ void ClassToolWidget::insertAllClassMethods(ParsedClass *parsedClass, PIAccess f void ClassToolWidget::insertAllClassAttributes(ParsedClass *parsedClass, PIAccess filter) { ClassTreeItem *lastItem = 0; - // First treat all parents. - for ( ParsedParent *pParent = parsedClass->parents.first(); + // First treat all tqparents. + for ( ParsedParent *pParent = parsedClass->tqparents.first(); pParent != 0; - pParent = parsedClass->parents.next() ) + pParent = parsedClass->tqparents.next() ) { - ParsedClass *parentClass = m_part->classStore()->getClassByName(pParent->name()); - if (parentClass) - addClassAndAttributes(parentClass, filter, &lastItem); + ParsedClass *tqparentClass = m_part->classStore()->getClassByName(pParent->name()); + if (tqparentClass) + addClassAndAttributes(tqparentClass, filter, &lastItem); } // Add the current class diff --git a/parts/classview/classtoolwidget.h b/parts/classview/classtoolwidget.h index 4d7d8036..740d5545 100644 --- a/parts/classview/classtoolwidget.h +++ b/parts/classview/classtoolwidget.h @@ -20,13 +20,14 @@ class ClassToolWidget : public ClassTreeBase { Q_OBJECT + TQ_OBJECT public: - ClassToolWidget(ClassViewPart *part, TQWidget *parent=0); + ClassToolWidget(ClassViewPart *part, TQWidget *tqparent=0); ~ClassToolWidget(); void insertClassAndClasses(ParsedClass *parsedClass, TQValueList classList); - void insertClassAndClasses(ParsedClass *parsedClass, const TQPtrList &parentList); + void insertClassAndClasses(ParsedClass *parsedClass, const TQPtrList &tqparentList); void insertAllClassMethods(ParsedClass *parsedClass, PIAccess filter); void insertAllClassAttributes(ParsedClass *parsedClass, PIAccess filter); diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp index c6d2770e..00a5a87a 100644 --- a/parts/classview/classtreebase.cpp +++ b/parts/classview/classtreebase.cpp @@ -95,7 +95,7 @@ TQString ClassTreeItem::scopedText() const if (m_item) return m_item->path(); - return TQString::null; + return TQString(); } @@ -121,7 +121,7 @@ TQString ClassTreeItem::text( int ) const { if (m_item) return m_item->asString(); - return TQString::null; + return TQString(); } @@ -149,7 +149,7 @@ void ClassTreeScopeItem::init() TQString ClassTreeScopeItem::text( int col ) const { if (!m_item) - return TQString::null; + return TQString(); if (m_item->name().isEmpty()) return i18n("Global"); return ClassTreeItem::text( col ); @@ -272,9 +272,9 @@ void ClassTreeClassItem::setOpen(bool o) ClassTreeItem::setOpen(o); } -ClassTreeMethodItem::ClassTreeMethodItem(ClassTreeItem *parent, ClassTreeItem *lastSibling, +ClassTreeMethodItem::ClassTreeMethodItem(ClassTreeItem *tqparent, ClassTreeItem *lastSibling, ParsedMethod *parsedMethod) - : ClassTreeItem(parent, lastSibling, parsedMethod) + : ClassTreeItem(tqparent, lastSibling, parsedMethod) { TQString icon; @@ -310,7 +310,7 @@ TQString ClassTreeMethodItem::text( int ) const TQString str; if ( !m_item ) - return TQString::null; + return TQString(); ParsedMethod* method = static_cast(m_item); @@ -336,9 +336,9 @@ TQString ClassTreeMethodItem::text( int ) const } -ClassTreeAttrItem::ClassTreeAttrItem(ClassTreeItem *parent, ClassTreeItem *lastSibling, +ClassTreeAttrItem::ClassTreeAttrItem(ClassTreeItem *tqparent, ClassTreeItem *lastSibling, ParsedAttribute *parsedAttr) - : ClassTreeItem(parent, lastSibling, parsedAttr) + : ClassTreeItem(tqparent, lastSibling, parsedAttr) { TQString icon; @@ -363,13 +363,13 @@ ClassTreeAttrItem::ClassTreeAttrItem(ClassTreeItem *parent, ClassTreeItem *lastS TQString ClassTreeAttrItem::text( int ) const { if ( !m_item ) - return TQString::null; + return TQString(); return m_item->name(); } -ClassTreeScriptItem::ClassTreeScriptItem(ClassTreeItem *parent, ClassTreeItem *lastSibling, +ClassTreeScriptItem::ClassTreeScriptItem(ClassTreeItem *tqparent, ClassTreeItem *lastSibling, ParsedScript *parsedScript) - : ClassTreeItem(parent, lastSibling, parsedScript) + : ClassTreeItem(tqparent, lastSibling, parsedScript) { TQString icon; @@ -387,7 +387,7 @@ ClassTreeScriptItem::ClassTreeScriptItem(ClassTreeItem *parent, ClassTreeItem *l TQString ClassTreeScriptItem::text( int ) const { if ( !m_item ) - return TQString::null; + return TQString(); return m_item->name(); } @@ -419,11 +419,11 @@ void ClassTreeScriptItem::setOpen(bool o) } -class ClassToolTip : public QToolTip +class ClassToolTip : public TQToolTip { public: - ClassToolTip( TQWidget *parent ) - : TQToolTip(parent) + ClassToolTip( TQWidget *tqparent ) + : TQToolTip(tqparent) {} protected: @@ -433,10 +433,10 @@ protected: void ClassToolTip::maybeTip(const TQPoint &p) { - ClassTreeBase *ctw = static_cast(parentWidget()); + ClassTreeBase *ctw = static_cast(tqparentWidget()); TQListViewItem *item = ctw->itemAt(p); - TQRect r = ctw->itemRect(item); + TQRect r = ctw->tqitemRect(item); if (item && r.isValid()) { ClassTreeItem *ctitem = static_cast(item); @@ -447,15 +447,15 @@ void ClassToolTip::maybeTip(const TQPoint &p) } -ClassTreeBase::ClassTreeBase(ClassViewPart *part, TQWidget *parent, const char *name) - : KListView(parent, name) +ClassTreeBase::ClassTreeBase(ClassViewPart *part, TQWidget *tqparent, const char *name) + : KListView(tqparent, name) { setFocusPolicy(ClickFocus); setRootIsDecorated(true); setResizeMode(TQListView::LastColumn); setSorting(-1); header()->hide(); - addColumn(TQString::null); + addColumn(TQString()); (void) new ClassToolTip(this); @@ -488,7 +488,7 @@ ClassTreeBase::TreeState ClassTreeBase::treeState() const TQListViewItem *item = it.current(); while (item) { path.prepend(item->text(0)); - item = item->parent(); + item = item->tqparent(); } state.append(path); } @@ -507,7 +507,7 @@ void ClassTreeBase::setTreeState(TreeState state) TQListViewItem *item = it.current(); while (item) { path.prepend(item->text(0)); - item = item->parent(); + item = item->tqparent(); } if (*tsit == path) { it.current()->setOpen(true); @@ -525,7 +525,7 @@ void ClassTreeBase::slotItemExecuted( TQListViewItem* item ) if (!item) return; - // toggle open state for parents + // toggle open state for tqparents if (item->childCount() > 0) setOpen(item, !isOpen(item)); diff --git a/parts/classview/classtreebase.h b/parts/classview/classtreebase.h index 91ac8054..5274d9e8 100644 --- a/parts/classview/classtreebase.h +++ b/parts/classview/classtreebase.h @@ -30,9 +30,10 @@ class KPopupMenu; class ClassTreeBase : public KListView { Q_OBJECT + TQ_OBJECT public: - ClassTreeBase( ClassViewPart *part, TQWidget *parent=0, const char *name=0 ); + ClassTreeBase( ClassViewPart *part, TQWidget *tqparent=0, const char *name=0 ); ~ClassTreeBase(); protected: @@ -66,18 +67,18 @@ protected: class ClassTreeItem : public TQListViewItem, public NotifyClient { public: - ClassTreeItem( ClassTreeBase *parent, ClassTreeItem *lastSibling, ParsedItem *parsedItem ) - : TQListViewItem(parent, lastSibling), NotifyClient(), m_item(parsedItem) + ClassTreeItem( ClassTreeBase *tqparent, ClassTreeItem *lastSibling, ParsedItem *parsedItem ) + : TQListViewItem(tqparent, lastSibling), NotifyClient(), m_item(parsedItem) { init(); } - ClassTreeItem( ClassTreeItem *parent, ClassTreeItem *lastSibling, ParsedItem *parsedItem ) - : TQListViewItem(parent, lastSibling), NotifyClient(), m_item(parsedItem) + ClassTreeItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling, ParsedItem *parsedItem ) + : TQListViewItem(tqparent, lastSibling), NotifyClient(), m_item(parsedItem) { init(); } ClassTreeItem( const ClassTreeItem& other ) - : TQListViewItem( other.parent(), other.nextSibling()), NotifyClient() + : TQListViewItem( other.tqparent(), other.nextSibling()), NotifyClient() { m_item = other.m_item; init(); @@ -122,14 +123,14 @@ protected: class ClassTreeOrganizerItem : public ClassTreeItem { public: - ClassTreeOrganizerItem( ClassTreeBase *parent, ClassTreeItem *lastSibling, + ClassTreeOrganizerItem( ClassTreeBase *tqparent, ClassTreeItem *lastSibling, const TQString &text ) - : ClassTreeItem(parent, lastSibling, 0 ) + : ClassTreeItem(tqparent, lastSibling, 0 ) , m_text( text ) { init(); } - ClassTreeOrganizerItem( ClassTreeItem *parent, ClassTreeItem *lastSibling, + ClassTreeOrganizerItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling, const TQString &text ) - : ClassTreeItem(parent, lastSibling, 0 ) + : ClassTreeItem(tqparent, lastSibling, 0 ) , m_text( text ) { init(); } ~ClassTreeOrganizerItem() @@ -147,15 +148,15 @@ private: class ClassTreeScopeItem : public ClassTreeItem { public: - ClassTreeScopeItem( ClassTreeBase *parent, ClassTreeItem *lastSibling, + ClassTreeScopeItem( ClassTreeBase *tqparent, ClassTreeItem *lastSibling, ParsedScopeContainer *parsedScope ) - : ClassTreeItem(parent, lastSibling, parsedScope) + : ClassTreeItem(tqparent, lastSibling, parsedScope) { init(); } - ClassTreeScopeItem( ClassTreeItem *parent, ClassTreeItem *lastSibling, + ClassTreeScopeItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling, ParsedScopeContainer *parsedScope ) - : ClassTreeItem(parent, lastSibling, parsedScope) + : ClassTreeItem(tqparent, lastSibling, parsedScope) { init(); } @@ -174,15 +175,15 @@ private: class ClassTreeClassItem : public ClassTreeItem { public: - ClassTreeClassItem( ClassTreeBase *parent, ClassTreeItem *lastSibling, + ClassTreeClassItem( ClassTreeBase *tqparent, ClassTreeItem *lastSibling, ParsedClass *parsedClass, bool isStruct=false ) - : ClassTreeItem(parent, lastSibling, parsedClass), m_isStruct( isStruct ) + : ClassTreeItem(tqparent, lastSibling, parsedClass), m_isStruct( isStruct ) { init(); } - ClassTreeClassItem( ClassTreeItem *parent, ClassTreeItem *lastSibling, + ClassTreeClassItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling, ParsedClass *parsedClass, bool isStruct=false ) - : ClassTreeItem(parent, lastSibling, parsedClass), m_isStruct( isStruct ) + : ClassTreeItem(tqparent, lastSibling, parsedClass), m_isStruct( isStruct ) { init(); } @@ -203,7 +204,7 @@ private: class ClassTreeMethodItem : public ClassTreeItem { public: - ClassTreeMethodItem( ClassTreeItem *parent, ClassTreeItem *lastSibling, + ClassTreeMethodItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling, ParsedMethod *parsedMethod ); ~ClassTreeMethodItem() { @@ -216,7 +217,7 @@ public: class ClassTreeAttrItem : public ClassTreeItem { public: - ClassTreeAttrItem( ClassTreeItem *parent, ClassTreeItem *lastSibling, + ClassTreeAttrItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling, ParsedAttribute *parsedAttr ); ~ClassTreeAttrItem() { @@ -228,7 +229,7 @@ public: class ClassTreeScriptItem : public ClassTreeItem { public: - ClassTreeScriptItem( ClassTreeItem *parent, ClassTreeItem *lastSibling, + ClassTreeScriptItem( ClassTreeItem *tqparent, ClassTreeItem *lastSibling, ParsedScript *parsedScript ); ~ClassTreeScriptItem() { diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp index 24163bf4..eceb656f 100644 --- a/parts/classview/classviewpart.cpp +++ b/parts/classview/classviewpart.cpp @@ -72,13 +72,13 @@ class FunctionCompletion : public CustomCompleter { TQString fScope; int cutpos; - if((cutpos = function.find('(')) != -1) { + if((cutpos = function.tqfind('(')) != -1) { args = function.right( function.length() - cutpos ); function = function.left( cutpos ); } else { return function; } - if((cutpos = function.findRev(':')) != -1 || (cutpos = function.findRev('.')) != -1) { + if((cutpos = function.tqfindRev(':')) != -1 || (cutpos = function.tqfindRev('.')) != -1) { fScope = function.left( cutpos + 1 ); function = function.right( function.length() - cutpos - 1); } @@ -103,7 +103,7 @@ class FunctionCompletion : public CustomCompleter { } virtual void removeItem ( const TQString &item ) { - FuncMap::iterator it = nameMap.find( item ); + FuncMap::iterator it = nameMap.tqfind( item ); if( it != nameMap.end() ) { KCompletion::removeItem( *it ); revNameMap.remove( *it ); @@ -118,7 +118,7 @@ class FunctionCompletion : public CustomCompleter { } virtual void postProcessMatch ( TQString *match ) const { - FuncMap::const_iterator it = revNameMap.find( *match ); + FuncMap::const_iterator it = revNameMap.tqfind( *match ); if( it != revNameMap.end() ) { *match = *it; } @@ -142,9 +142,9 @@ typedef KDevGenericFactory ClassViewFactory; static const KDevPluginInfo data("kdevclassview"); K_EXPORT_COMPONENT_FACTORY( libkdevclassview, ClassViewFactory( data ) ) -ClassViewPart::ClassViewPart(TQObject *parent, const char *name, const TQStringList& ) - :/// KDevPlugin( &data, parent, name ? name : "ClassViewPart" ), - KDevCodeBrowserFrontend( &data, parent, name ? name : "ClassViewPart" ), +ClassViewPart::ClassViewPart(TQObject *tqparent, const char *name, const TQStringList& ) + :/// KDevPlugin( &data, tqparent, name ? name : "ClassViewPart" ), + KDevCodeBrowserFrontend( &data, tqparent, name ? name : "ClassViewPart" ), m_activeDocument(0), m_activeView(0), m_activeSelection(0), m_activeEditor(0), m_activeViewCursor(0), m_hierarchyDlg(0) { setInstance(ClassViewFactory::instance()); @@ -254,16 +254,16 @@ void ClassViewPart::activePartChanged( KParts::Part * part) m_activeSelection = dynamic_cast( part ); m_activeViewCursor = part ? dynamic_cast( m_activeView ) : 0; - m_activeFileName = TQString::null; + m_activeFileName = TQString(); if (m_activeDocument) { m_activeFileName = URLUtil::canonicalPath( m_activeDocument->url().path() ); navigator->refreshNavBars(m_activeFileName); navigator->syncFunctionNavDelayed(200); -/* if ( languageSupport()->mimeTypes().find( +/* if ( languageSupport()->mimeTypes().tqfind( KMimeType::findByPath(m_activeFileName)) != languageSupport()->mimeTypes().end() ) - m_activeFileName = TQString::null;*/ + m_activeFileName = TQString();*/ } if( m_activeViewCursor ) { diff --git a/parts/classview/classviewpart.h b/parts/classview/classviewpart.h index bbad40e6..65044346 100644 --- a/parts/classview/classviewpart.h +++ b/parts/classview/classviewpart.h @@ -55,8 +55,9 @@ class HierarchyDialog; class ClassViewPart : public Extensions::KDevCodeBrowserFrontend { Q_OBJECT + TQ_OBJECT public: - ClassViewPart(TQObject *parent, const char *name, const TQStringList &); + ClassViewPart(TQObject *tqparent, const char *name, const TQStringList &); virtual ~ClassViewPart(); bool langHasFeature(KDevLanguageSupport::Features feature); diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp index 64079546..1eccf136 100644 --- a/parts/classview/classviewwidget.cpp +++ b/parts/classview/classviewwidget.cpp @@ -71,28 +71,28 @@ ClassViewWidget::ClassViewWidget( ClassViewPart * part ) m_actionViewMode->setItems( lst ); m_actionViewMode->setWhatsThis(i18n("View mode

Class browser items can be grouped by directories, listed in a plain or java like view.")); - m_actionNewClass = new KAction( i18n("New Class..."), KShortcut(), this, TQT_SLOT(slotNewClass()), + m_actionNewClass = new KAction( i18n("New Class..."), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotNewClass()), m_part->actionCollection(), "classview_new_class" ); m_actionNewClass->setWhatsThis(i18n("New class

Calls the New Class wizard.")); - m_actionCreateAccessMethods = new KAction( i18n("Create get/set Methods"), KShortcut(), this, TQT_SLOT(slotCreateAccessMethods()), m_part->actionCollection(), "classview_create_access_methods" ); + m_actionCreateAccessMethods = new KAction( i18n("Create get/set Methods"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotCreateAccessMethods()), m_part->actionCollection(), "classview_create_access_methods" ); - m_actionAddMethod = new KAction( i18n("Add Method..."), KShortcut(), this, TQT_SLOT(slotAddMethod()), + m_actionAddMethod = new KAction( i18n("Add Method..."), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddMethod()), m_part->actionCollection(), "classview_add_method" ); m_actionAddMethod->setWhatsThis(i18n("Add method

Calls the New Method wizard.")); - m_actionAddAttribute = new KAction( i18n("Add Attribute..."), KShortcut(), this, TQT_SLOT(slotAddAttribute()), + m_actionAddAttribute = new KAction( i18n("Add Attribute..."), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddAttribute()), m_part->actionCollection(), "classview_add_attribute" ); m_actionAddAttribute->setWhatsThis(i18n("Add attribute

Calls the New Attribute wizard.")); - m_actionOpenDeclaration = new KAction( i18n("Open Declaration"), KShortcut(), this, TQT_SLOT(slotOpenDeclaration()), + m_actionOpenDeclaration = new KAction( i18n("Open Declaration"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotOpenDeclaration()), m_part->actionCollection(), "classview_open_declaration" ); m_actionOpenDeclaration->setWhatsThis(i18n("Open declaration

Opens a file where the selected item is declared and jumps to the declaration line.")); - m_actionOpenImplementation = new KAction( i18n("Open Implementation"), KShortcut(), this, TQT_SLOT(slotOpenImplementation()), + m_actionOpenImplementation = new KAction( i18n("Open Implementation"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotOpenImplementation()), m_part->actionCollection(), "classview_open_implementation" ); m_actionOpenImplementation->setWhatsThis(i18n("Open implementation

Opens a file where the selected item is defined (implemented) and jumps to the definition line.")); - m_actionFollowEditor = new KToggleAction( i18n("Follow Editor"), KShortcut(), this, TQT_SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" ); + m_actionFollowEditor = new KToggleAction( i18n("Follow Editor"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" ); KConfig* config = m_part->instance()->config(); config->setGroup( "General" ); @@ -116,7 +116,7 @@ template if( c ) { KSharedPtr d( c ); - typename TQMap, ListItemType*>::ConstIterator it = map.find(d); + typename TQMap, ListItemType*>::ConstIterator it = map.tqfind(d); if( it != map.end() ) { ( *it )->select(); return true; @@ -482,13 +482,13 @@ void FolderBrowserItem::processFile( FileDom file, TQStringList& path, bool remo TQString current = path.front(); path.pop_front(); - FolderBrowserItem* item = m_folders.contains( current ) ? m_folders[ current ] : 0; + FolderBrowserItem* item = m_folders.tqcontains( current ) ? m_folders[ current ] : 0; if( !item ){ if( remove ) return; item = new FolderBrowserItem( m_widget, this, current ); - if( listView()->removedText.contains(current) ) + if( listView()->removedText.tqcontains(current) ) item->setOpen( true ); m_folders.insert( current, item ); } @@ -507,13 +507,13 @@ void FolderBrowserItem::processFile( FileDom file, TQStringList& path, bool remo void FolderBrowserItem::processNamespace( NamespaceDom ns, bool remove ) { - NamespaceDomBrowserItem* item = m_namespaces.contains( ns->name() ) ? m_namespaces[ ns->name() ] : 0; + NamespaceDomBrowserItem* item = m_namespaces.tqcontains( ns->name() ) ? m_namespaces[ ns->name() ] : 0; if( !item ){ if( remove ) return; item = new NamespaceDomBrowserItem( this, ns ); - if( listView()->removedText.contains(ns->name()) ) + if( listView()->removedText.tqcontains(ns->name()) ) item->setOpen( true ); m_namespaces.insert( ns->name(), item ); } @@ -547,13 +547,13 @@ void FolderBrowserItem::processNamespace( NamespaceDom ns, bool remove ) void FolderBrowserItem::processClass( ClassDom klass, bool remove ) { - ClassDomBrowserItem* item = m_classes.contains( klass ) ? m_classes[ klass ] : 0; + ClassDomBrowserItem* item = m_classes.tqcontains( klass ) ? m_classes[ klass ] : 0; if( !item ){ if( remove ) return; item = new ClassDomBrowserItem( this, klass ); - if( listView()->removedText.contains(klass->name()) ) + if( listView()->removedText.tqcontains(klass->name()) ) item->setOpen( true ); m_classes.insert( klass, item ); } @@ -584,13 +584,13 @@ void FolderBrowserItem::processClass( ClassDom klass, bool remove ) void FolderBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool remove ) { - TypeAliasDomBrowserItem* item = m_typeAliases.contains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0; + TypeAliasDomBrowserItem* item = m_typeAliases.tqcontains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0; if( !item ){ if( remove ) return; item = new TypeAliasDomBrowserItem( this, typeAlias ); - if( listView()->removedText.contains(typeAlias->name()) ) + if( listView()->removedText.tqcontains(typeAlias->name()) ) item->setOpen( true ); m_typeAliases.insert( typeAlias, item ); } @@ -607,7 +607,7 @@ void FolderBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool remove ) void FolderBrowserItem::processFunction( FunctionDom fun, bool remove ) { - FunctionDomBrowserItem* item = m_functions.contains( fun ) ? m_functions[ fun ] : 0; + FunctionDomBrowserItem* item = m_functions.tqcontains( fun ) ? m_functions[ fun ] : 0; if( !item ){ if( remove ) return; @@ -625,7 +625,7 @@ void FolderBrowserItem::processFunction( FunctionDom fun, bool remove ) void FolderBrowserItem::processVariable( VariableDom var, bool remove ) { - VariableDomBrowserItem* item = m_variables.contains( var ) ? m_variables[ var ] : 0; + VariableDomBrowserItem* item = m_variables.tqcontains( var ) ? m_variables[ var ] : 0; if( !item ){ if( remove ) return; @@ -679,13 +679,13 @@ bool NamespaceDomBrowserItem::selectItem( ItemDom item) void NamespaceDomBrowserItem::processNamespace( NamespaceDom ns, bool remove ) { - NamespaceDomBrowserItem* item = m_namespaces.contains( ns->name() ) ? m_namespaces[ ns->name() ] : 0; + NamespaceDomBrowserItem* item = m_namespaces.tqcontains( ns->name() ) ? m_namespaces[ ns->name() ] : 0; if( !item ){ if( remove ) return; item = new NamespaceDomBrowserItem( this, ns ); - if( listView()->removedText.contains(ns->name()) ) + if( listView()->removedText.tqcontains(ns->name()) ) item->setOpen( true ); m_namespaces.insert( ns->name(), item ); } @@ -719,13 +719,13 @@ void NamespaceDomBrowserItem::processNamespace( NamespaceDom ns, bool remove ) void NamespaceDomBrowserItem::processClass( ClassDom klass, bool remove ) { - ClassDomBrowserItem* item = m_classes.contains( klass ) ? m_classes[ klass ] : 0; + ClassDomBrowserItem* item = m_classes.tqcontains( klass ) ? m_classes[ klass ] : 0; if( !item ){ if( remove ) return; item = new ClassDomBrowserItem( this, klass ); - if( listView()->removedText.contains(klass->name()) ) + if( listView()->removedText.tqcontains(klass->name()) ) item->setOpen( true ); m_classes.insert( klass, item ); } @@ -756,13 +756,13 @@ void NamespaceDomBrowserItem::processClass( ClassDom klass, bool remove ) void NamespaceDomBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool remove ) { - TypeAliasDomBrowserItem* item = m_typeAliases.contains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0; + TypeAliasDomBrowserItem* item = m_typeAliases.tqcontains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0; if( !item ){ if( remove ) return; item = new TypeAliasDomBrowserItem( this, typeAlias ); - if( listView()->removedText.contains(typeAlias->name()) ) + if( listView()->removedText.tqcontains(typeAlias->name()) ) item->setOpen( true ); m_typeAliases.insert( typeAlias, item ); } @@ -779,7 +779,7 @@ void NamespaceDomBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool rem void NamespaceDomBrowserItem::processFunction( FunctionDom fun, bool remove ) { - FunctionDomBrowserItem* item = m_functions.contains( fun ) ? m_functions[ fun ] : 0; + FunctionDomBrowserItem* item = m_functions.tqcontains( fun ) ? m_functions[ fun ] : 0; if( !item ){ if( remove ) return; @@ -797,7 +797,7 @@ void NamespaceDomBrowserItem::processFunction( FunctionDom fun, bool remove ) void NamespaceDomBrowserItem::processVariable( VariableDom var, bool remove ) { - VariableDomBrowserItem* item = m_variables.contains( var ) ? m_variables[ var ] : 0; + VariableDomBrowserItem* item = m_variables.tqcontains( var ) ? m_variables[ var ] : 0; if( !item ){ if( remove ) return; @@ -844,13 +844,13 @@ bool ClassDomBrowserItem::selectItem(ItemDom item) void ClassDomBrowserItem::processClass( ClassDom klass, bool remove ) { - ClassDomBrowserItem* item = m_classes.contains( klass ) ? m_classes[ klass ] : 0; + ClassDomBrowserItem* item = m_classes.tqcontains( klass ) ? m_classes[ klass ] : 0; if( !item ){ if( remove ) return; item = new ClassDomBrowserItem( this, klass ); - if( listView()->removedText.contains(klass->name()) ) + if( listView()->removedText.tqcontains(klass->name()) ) item->setOpen( true ); m_classes.insert( klass, item ); } @@ -881,13 +881,13 @@ void ClassDomBrowserItem::processClass( ClassDom klass, bool remove ) void ClassDomBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool remove ) { - TypeAliasDomBrowserItem* item = m_typeAliases.contains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0; + TypeAliasDomBrowserItem* item = m_typeAliases.tqcontains( typeAlias ) ? m_typeAliases[ typeAlias ] : 0; if( !item ){ if( remove ) return; item = new TypeAliasDomBrowserItem( this, typeAlias ); - if( listView()->removedText.contains(typeAlias->name()) ) + if( listView()->removedText.tqcontains(typeAlias->name()) ) item->setOpen( true ); m_typeAliases.insert( typeAlias, item ); } @@ -904,7 +904,7 @@ void ClassDomBrowserItem::processTypeAlias( TypeAliasDom typeAlias, bool remove void ClassDomBrowserItem::processFunction( FunctionDom fun, bool remove ) { - FunctionDomBrowserItem* item = m_functions.contains( fun ) ? m_functions[ fun ] : 0; + FunctionDomBrowserItem* item = m_functions.tqcontains( fun ) ? m_functions[ fun ] : 0; if( !item ){ if( remove ) return; @@ -922,7 +922,7 @@ void ClassDomBrowserItem::processFunction( FunctionDom fun, bool remove ) void ClassDomBrowserItem::processVariable( VariableDom var, bool remove ) { - VariableDomBrowserItem* item = m_variables.contains( var ) ? m_variables[ var ] : 0; + VariableDomBrowserItem* item = m_variables.tqcontains( var ) ? m_variables[ var ] : 0; if( !item ){ if( remove ) return; @@ -1212,13 +1212,13 @@ void ClassViewWidget::maybeTip( TQPoint const & p ) ++it; } - TQString strstatic = fitem->dom()->isStatic() ? TQString( "[static] " ) : TQString::null; - TQString strsignal = fitem->dom()->isSignal() ? TQString( "[signal] " ) : TQString::null; - TQString strslot = fitem->dom()->isSlot() ? TQString( "[slot] " ) : TQString::null; - TQString strresult = !fitem->dom()->resultType().isEmpty() ? fitem->dom()->resultType() + " " : TQString::null; + TQString strstatic = fitem->dom()->isStatic() ? TQString( "[static] " ) : TQString(); + TQString strsignal = fitem->dom()->isSignal() ? TQString( "[signal] " ) : TQString(); + TQString strslot = fitem->dom()->isSlot() ? TQString( "[slot] " ) : TQString(); + TQString strresult = !fitem->dom()->resultType().isEmpty() ? fitem->dom()->resultType() + " " : TQString(); - TQString strconstant = fitem->dom()->isConstant() ? TQString( " [const]" ) : TQString::null; - TQString strabstract = fitem->dom()->isAbstract() ? TQString( " [abstract]" ) : TQString::null; + TQString strconstant = fitem->dom()->isConstant() ? TQString( " [const]" ) : TQString(); + TQString strabstract = fitem->dom()->isAbstract() ? TQString( " [abstract]" ) : TQString(); tooltip = access + strstatic + strsignal + strslot + strresult + fitem->dom()->scope().join("::") + "::" + fitem->dom()->name() @@ -1238,7 +1238,7 @@ void ClassViewWidget::maybeTip( TQPoint const & p ) else if ( vitem->dom()->access() == CodeModelItem::Public ) access = "[public] "; - TQString strstatic = vitem->dom()->isStatic() ? TQString( "[static] " ) : TQString::null; + TQString strstatic = vitem->dom()->isStatic() ? TQString( "[static] " ) : TQString(); tooltip = access + strstatic + vitem->dom()->type() + " " + vitem->dom()->name(); } } @@ -1259,7 +1259,7 @@ void ClassViewWidget::maybeTip( TQPoint const & p ) kdDebug(0) << tooltip << endl; - TQRect r = itemRect( item ); + TQRect r = tqitemRect( item ); if ( item && r.isValid() && !tooltip.isEmpty() ) { @@ -1277,7 +1277,7 @@ void ClassViewWidget::slotCreateAccessMethods( ) if (item == 0) return; - m_part->languageSupport()->createAccessMethods(static_cast(static_cast(item->parent())->dom()),static_cast(item->dom())); + m_part->languageSupport()->createAccessMethods(static_cast(static_cast(item->tqparent())->dom()),static_cast(item->dom())); } } diff --git a/parts/classview/classviewwidget.h b/parts/classview/classviewwidget.h index 0ace5692..29276a31 100644 --- a/parts/classview/classviewwidget.h +++ b/parts/classview/classviewwidget.h @@ -43,9 +43,10 @@ class VariableDomBrowserItem; class KSelectAction; class KToggleAction; -class ClassViewWidget : public KListView, public QToolTip +class ClassViewWidget : public KListView, public TQToolTip { Q_OBJECT + TQ_OBJECT public: enum ViewMode { @@ -120,10 +121,10 @@ class ClassViewItem: public FancyListViewItem { private: public: - ClassViewItem( TQListView* parent, const TQString& text=TQString::null ) - : FancyListViewItem( static_cast( parent )->m_paintStyles, parent, text ) {} - ClassViewItem( TQListViewItem* parent, const TQString& text=TQString::null ) - : FancyListViewItem( static_cast( parent->listView() )->m_paintStyles, parent, text ) {} + ClassViewItem( TQListView* tqparent, const TQString& text=TQString() ) + : FancyListViewItem( static_cast( tqparent )->m_paintStyles, tqparent, text ) {} + ClassViewItem( TQListViewItem* tqparent, const TQString& text=TQString() ) + : FancyListViewItem( static_cast( tqparent->listView() )->m_paintStyles, tqparent, text ) {} virtual const CodeModelItem* model() const { return 0; } @@ -152,10 +153,10 @@ public: class FolderBrowserItem: public ClassViewItem { public: - FolderBrowserItem( ClassViewWidget* widget, TQListView* parent, const TQString& name=TQString::null ) - : ClassViewItem( parent, name ), m_widget(widget) {} - FolderBrowserItem( ClassViewWidget* widget, TQListViewItem* parent, const TQString& name=TQString::null ) - : ClassViewItem( parent, name ), m_widget(widget) {} + FolderBrowserItem( ClassViewWidget* widget, TQListView* tqparent, const TQString& name=TQString() ) + : ClassViewItem( tqparent, name ), m_widget(widget) {} + FolderBrowserItem( ClassViewWidget* widget, TQListViewItem* tqparent, const TQString& name=TQString() ) + : ClassViewItem( tqparent, name ), m_widget(widget) {} virtual bool isFolder() const { return true; } @@ -184,10 +185,10 @@ private: class NamespaceDomBrowserItem: public ClassViewItem { public: - NamespaceDomBrowserItem( TQListView* parent, NamespaceDom dom ) - : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} - NamespaceDomBrowserItem( TQListViewItem* parent, NamespaceDom dom ) - : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} + NamespaceDomBrowserItem( TQListView* tqparent, NamespaceDom dom ) + : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} + NamespaceDomBrowserItem( TQListViewItem* tqparent, NamespaceDom dom ) + : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} const CodeModelItem* model() const { return m_dom; } @@ -218,10 +219,10 @@ private: class ClassDomBrowserItem: public ClassViewItem { public: - ClassDomBrowserItem( TQListView* parent, ClassDom dom ) - : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} - ClassDomBrowserItem( TQListViewItem* parent, ClassDom dom ) - : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} + ClassDomBrowserItem( TQListView* tqparent, ClassDom dom ) + : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} + ClassDomBrowserItem( TQListViewItem* tqparent, ClassDom dom ) + : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} const CodeModelItem* model() const { return m_dom; } virtual bool isClass() const { return true; } @@ -256,10 +257,10 @@ private: class TypeAliasDomBrowserItem: public ClassViewItem { public: - TypeAliasDomBrowserItem( TQListView* parent, TypeAliasDom dom ) - : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} - TypeAliasDomBrowserItem( TQListViewItem* parent, TypeAliasDom dom ) - : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} + TypeAliasDomBrowserItem( TQListView* tqparent, TypeAliasDom dom ) + : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} + TypeAliasDomBrowserItem( TQListViewItem* tqparent, TypeAliasDom dom ) + : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} const CodeModelItem* model() const { return m_dom; } virtual bool isTypeAlias() const { return true; } @@ -284,10 +285,10 @@ private: class FunctionDomBrowserItem: public ClassViewItem { public: - FunctionDomBrowserItem( TQListView* parent, FunctionDom dom ) - : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} - FunctionDomBrowserItem( TQListViewItem* parent, FunctionDom dom ) - : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} + FunctionDomBrowserItem( TQListView* tqparent, FunctionDom dom ) + : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} + FunctionDomBrowserItem( TQListViewItem* tqparent, FunctionDom dom ) + : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} const CodeModelItem* model() const { return m_dom; } virtual bool isFunction() const { return true; } @@ -315,10 +316,10 @@ private: class VariableDomBrowserItem: public ClassViewItem { public: - VariableDomBrowserItem( TQListView* parent, VariableDom dom ) - : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} - VariableDomBrowserItem( TQListViewItem* parent, VariableDom dom ) - : ClassViewItem( parent, dom->name() ), m_dom( dom ) {} + VariableDomBrowserItem( TQListView* tqparent, VariableDom dom ) + : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} + VariableDomBrowserItem( TQListViewItem* tqparent, VariableDom dom ) + : ClassViewItem( tqparent, dom->name() ), m_dom( dom ) {} const CodeModelItem* model() const { return m_dom; } virtual bool isVariable() const { return true; } diff --git a/parts/classview/digraphview.cpp b/parts/classview/digraphview.cpp index 8bb8e963..1e2f7dfd 100644 --- a/parts/classview/digraphview.cpp +++ b/parts/classview/digraphview.cpp @@ -43,8 +43,8 @@ struct DigraphEdge }; -DigraphView::DigraphView(TQWidget *parent, const char *name) - : TQScrollView(parent, name, WRepaintNoErase|WStaticContents|WResizeNoErase) +DigraphView::DigraphView(TQWidget *tqparent, const char *name) + : TQScrollView(tqparent, name, WRepaintNoErase|WStaticContents|WResizeNoErase) { viewport()->setBackgroundMode(PaletteBase); @@ -173,13 +173,13 @@ TQStringList DigraphView::splitLine(TQString str) while (!str.isEmpty()) { if (str[0] == '"') { - int pos = str.find('"', 1); + int pos = str.tqfind('"', 1); if (pos == -1) pos = str.length(); result << str.mid(1, pos-1); str.remove(0, pos+1); } else { - int pos = str.find(' '); + int pos = str.tqfind(' '); if (pos == -1) pos = str.length(); result << str.left(pos); @@ -235,7 +235,7 @@ void DigraphView::process( const TQString& file, const TQString& ext ) TQTextStream &is = *ifile.textStream(); is << "digraph G {" << endl; is << "rankdir=LR;" << endl; - is << "node [shape=box,fontname=Helvetica,fontsize=12];" << endl; + is << "node [tqshape=box,fontname=Helvetica,fontsize=12];" << endl; TQStringList::Iterator it; for (it = inputs.begin(); it != inputs.end(); ++it) is << (*it) << endl; @@ -313,7 +313,7 @@ void DigraphView::drawContents(TQPainter* p, int clipx, int clipy, int clipw, in triangle[0] = p2 + TQPoint((int)(d11+d21),(int)(d12+d22)); triangle[1] = p2 + TQPoint((int)(d11-d21),(int)(d12-d22)); triangle[2] = p2; - p->drawPolygon(triangle, true); + p->tqdrawPolygon(triangle, true); } } @@ -323,7 +323,7 @@ void DigraphView::contentsMousePressEvent(TQMouseEvent *e) TQPtrListIterator it1(nodes); for (; it1.current(); ++it1) { TQRect r((*it1)->x-(*it1)->w/2, (*it1)->y-(*it1)->h/2, (*it1)->w, (*it1)->h); - if (r.contains(e->pos())) { + if (r.tqcontains(e->pos())) { if (selNode) { TQRect oldr(selNode->x-selNode->w/2, selNode->y-selNode->h/2, selNode->w, selNode->h); @@ -338,7 +338,7 @@ void DigraphView::contentsMousePressEvent(TQMouseEvent *e) } -TQSize DigraphView::sizeHint() const +TQSize DigraphView::tqsizeHint() const { if (width == -1) return TQSize(100, 100); // arbitrary diff --git a/parts/classview/digraphview.h b/parts/classview/digraphview.h index b7215075..216e972e 100644 --- a/parts/classview/digraphview.h +++ b/parts/classview/digraphview.h @@ -21,12 +21,13 @@ class DigraphNode; class DigraphEdge; -class DigraphView : public QScrollView +class DigraphView : public TQScrollView { Q_OBJECT + TQ_OBJECT public: - DigraphView(TQWidget *parent, const char *name); + DigraphView(TQWidget *tqparent, const char *name); ~DigraphView(); void addEdge(const TQString &name1, const TQString &name2); @@ -41,7 +42,7 @@ signals: protected: virtual void drawContents(TQPainter* p, int clipx, int clipy, int clipw, int cliph); virtual void contentsMousePressEvent(TQMouseEvent *e); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; private: int toXPixel(double x); diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp index a1f2c763..2eedf64d 100644 --- a/parts/classview/hierarchydlg.cpp +++ b/parts/classview/hierarchydlg.cpp @@ -41,30 +41,30 @@ HierarchyDialog::HierarchyDialog( ClassViewPart *part ) : TQDialog(0, "hierarchy dialog", false) { class_combo = new KComboView(true, 150, this); - class_combo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ); + class_combo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ); // class_combo->setMinimumWidth(150); namespace_combo = new KComboView(true, 150, this); - namespace_combo->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ); + namespace_combo->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ); // namespace_combo->setMinimumWidth(150); TQPushButton *close_button = new KPushButton(KStdGuiItem::close(), this); TQPushButton *save_button = new KPushButton(KStdGuiItem::save(), this); TQPushButton *refresh_button = new KPushButton(i18n("Refresh"), this); - TQSplitter *splitter = new TQSplitter(Vertical, this); + TQSplitter *splitter = new TQSplitter(Qt::Vertical, this); digraph = new DigraphView(splitter, "digraph view"); // member_tree = new ClassToolWidget(part, splitter); - TQBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); TQBoxLayout *combo_layout = new TQHBoxLayout(); - layout->addLayout(combo_layout); + tqlayout->addLayout(combo_layout); combo_layout->addWidget(namespace_combo); combo_layout->addWidget(class_combo); combo_layout->addSpacing(60); combo_layout->addWidget(refresh_button); combo_layout->addWidget(save_button); combo_layout->addWidget(close_button); - layout->addWidget(splitter); + tqlayout->addWidget(splitter); connect( namespace_combo, TQT_SIGNAL(activated(TQListViewItem*)), this, TQT_SLOT(slotNamespaceComboChoice(TQListViewItem*)) ); @@ -96,7 +96,7 @@ HierarchyDialog::~HierarchyDialog() void HierarchyDialog::save() { - KURLRequesterDlg dlg(TQString::null, this, "save_inheritance"); + KURLRequesterDlg dlg(TQString(), this, "save_inheritance"); dlg.fileDialog()->setFilter("image/png image/jpeg image/bmp image/svg+xml"); dlg.fileDialog()->setOperationMode( KFileDialog::Saving ); dlg.fileDialog()->setMode( KFile::File | KFile::LocalOnly ); @@ -104,7 +104,7 @@ void HierarchyDialog::save() if(dlg.exec() && dlg.selectedURL().isLocalFile()) { TQFileInfo fi(dlg.selectedURL().pathOrURL()); - TQApplication::setOverrideCursor( Qt::waitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); KDevLanguageSupport *ls = m_part->languageSupport(); for (TQMap::const_iterator it = classes.begin(); it != classes.end(); ++it) { @@ -113,7 +113,7 @@ void HierarchyDialog::save() TQStringList baseClasses = it.data()->baseClassList(); for (TQStringList::const_iterator bit = baseClasses.begin(); bit != baseClasses.end(); ++bit) { - TQMap::const_iterator baseIt = uclasses.find(*bit); + TQMap::const_iterator baseIt = uclasses.tqfind(*bit); if (baseIt != uclasses.end()) { TQString formattedParentName = ls->formatClassName(baseIt.data()); @@ -143,7 +143,7 @@ void HierarchyDialog::refresh() TQStringList baseClasses = it.data()->baseClassList(); for (TQStringList::const_iterator bit = baseClasses.begin(); bit != baseClasses.end(); ++bit) { - TQMap::const_iterator baseIt = uclasses.find(*bit); + TQMap::const_iterator baseIt = uclasses.tqfind(*bit); if (baseIt != uclasses.end()) { TQString formattedParentName = ls->formatClassName(baseIt.data()); diff --git a/parts/classview/hierarchydlg.h b/parts/classview/hierarchydlg.h index dd5c8a36..27d5b2a4 100644 --- a/parts/classview/hierarchydlg.h +++ b/parts/classview/hierarchydlg.h @@ -23,9 +23,10 @@ class ClassToolWidget; class KComboView; class TQListViewItem; -class HierarchyDialog : public QDialog +class HierarchyDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: HierarchyDialog( ClassViewPart *part ); diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp index fa83a4ff..78415d8c 100644 --- a/parts/classview/navigator.cpp +++ b/parts/classview/navigator.cpp @@ -46,7 +46,7 @@ namespace { template - TQValueList QValueList_reversed ( const TQValueList & list ) + TQValueList TQValueList_reversed ( const TQValueList & list ) { TQValueList rList; typename TQValueList::ConstIterator it = list.begin(); @@ -85,10 +85,10 @@ private: public: enum Type { Declaration, Definition }; - FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, TQListView *parent, TQString name, Type type) - :FancyListViewItem(styles, parent, name, ""), m_part(part), m_type(type) {} - FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, TQListViewItem *parent, TQString name, Type type) - :FancyListViewItem(styles, parent, name, ""), m_part(part), m_type(type) {} + FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, TQListView *tqparent, TQString name, Type type) + :FancyListViewItem(styles, tqparent, name, ""), m_part(part), m_type(type) {} + FunctionNavItem(TextPaintStyleStore& styles, ClassViewPart *part, TQListViewItem *tqparent, TQString name, Type type) + :FancyListViewItem(styles, tqparent, name, ""), m_part(part), m_type(type) {} ~FunctionNavItem() {} virtual void setup() @@ -104,8 +104,8 @@ private: }; -Navigator::Navigator(ClassViewPart *parent, const char *name) - : TQObject(parent, name), m_part(parent) +Navigator::Navigator(ClassViewPart *tqparent, const char *name) + : TQObject(tqparent, name), m_part(tqparent) { m_state = GoToDefinitions; m_navNoDefinition = true; @@ -289,7 +289,7 @@ void Navigator::refreshNavBars(const TQString &activeFileName, bool clear) { TQMap::iterator it2 = it; ++it; - if ( !toLeave.contains( it2.key() ) ) + if ( !toLeave.tqcontains( it2.key() ) ) { if (it2.data()) { @@ -331,7 +331,7 @@ void Navigator::refreshNavBars(const TQString &activeFileName, bool clear) { TQMap::iterator it2 = itt; ++itt; - if ( !toLeave.contains( it2.key() ) ) + if ( !toLeave.tqcontains( it2.key() ) ) { if (it2.data()) { @@ -397,14 +397,14 @@ TextPaintItem highlightFunctionName(TQString function, int type, TextPaintStyleS TQString fScope; int cutpos; - if((cutpos = function.find('(')) != -1) { + if((cutpos = function.tqfind('(')) != -1) { args = function.right( function.length() - cutpos ); function = function.left( cutpos ); } else { ret.addItem( function ); return ret; } - if((cutpos = function.findRev(':')) != -1 || (cutpos = function.findRev('.')) != -1) { + if((cutpos = function.tqfindRev(':')) != -1 || (cutpos = function.tqfindRev('.')) != -1) { fScope = function.left( cutpos + 1 ); function = function.right( function.length() - cutpos - 1); } @@ -499,7 +499,7 @@ void Navigator::slotJumpToPreviousFunction() unsigned int currentLine, currentCol; m_part->m_activeViewCursor->cursorPositionReal ( ¤tLine, ¤tCol ); - TQValueList lines = QValueList_reversed ( functionStartLines() ); + TQValueList lines = TQValueList_reversed ( functionStartLines() ); if ( lines.isEmpty() ) return; TQValueList::iterator it = lines.begin(); diff --git a/parts/classview/navigator.h b/parts/classview/navigator.h index 80b1ca4d..3338e4b1 100644 --- a/parts/classview/navigator.h +++ b/parts/classview/navigator.h @@ -36,13 +36,14 @@ class KAction; class TextPaintItem; TextPaintItem highlightFunctionName( TQString function, int type, TextPaintStyleStore& styles ); -class Navigator : public QObject +class Navigator : public TQObject { Q_OBJECT + TQ_OBJECT public: enum NavigationState { GoToDefinitions, GoToDeclarations }; - Navigator(ClassViewPart *parent, const char *name = 0); + Navigator(ClassViewPart *tqparent, const char *name = 0); ~Navigator(); void stopTimer(); diff --git a/parts/classview/viewcombos.cpp b/parts/classview/viewcombos.cpp index bb7bf01d..bc1c4f3b 100644 --- a/parts/classview/viewcombos.cpp +++ b/parts/classview/viewcombos.cpp @@ -27,13 +27,13 @@ #include "viewcombos.h" #include "classviewpart.h" -NamespaceItem::NamespaceItem(ClassViewPart *part, TQListView *parent, TQString name, NamespaceDom dom) - :TQListViewItem(parent, name), m_dom(dom), m_part(part) +NamespaceItem::NamespaceItem(ClassViewPart *part, TQListView *tqparent, TQString name, NamespaceDom dom) + :TQListViewItem(tqparent, name), m_dom(dom), m_part(part) { } -NamespaceItem::NamespaceItem(ClassViewPart *part, TQListViewItem *parent, TQString name, NamespaceDom dom) - :TQListViewItem(parent, name), m_dom(dom), m_part(part) +NamespaceItem::NamespaceItem(ClassViewPart *part, TQListViewItem *tqparent, TQString name, NamespaceDom dom) + :TQListViewItem(tqparent, name), m_dom(dom), m_part(part) { } @@ -53,13 +53,13 @@ void NamespaceItem::setup() } -ClassItem::ClassItem(ClassViewPart *part, TQListView *parent, TQString name, ClassDom dom) - :TQListViewItem(parent, name), m_dom(dom), m_part(part) +ClassItem::ClassItem(ClassViewPart *part, TQListView *tqparent, TQString name, ClassDom dom) + :TQListViewItem(tqparent, name), m_dom(dom), m_part(part) { } -ClassItem::ClassItem(ClassViewPart *part, TQListViewItem *parent, TQString name, ClassDom dom) - :TQListViewItem(parent, name), m_dom(dom), m_part(part) +ClassItem::ClassItem(ClassViewPart *part, TQListViewItem *tqparent, TQString name, ClassDom dom) + :TQListViewItem(tqparent, name), m_dom(dom), m_part(part) { } @@ -79,13 +79,13 @@ void ClassItem::setup() } -FunctionItem::FunctionItem(ClassViewPart *part, TQListView *parent, TQString name, FunctionDom dom) - :TQListViewItem(parent, name), m_dom(dom), m_part(part) +FunctionItem::FunctionItem(ClassViewPart *part, TQListView *tqparent, TQString name, FunctionDom dom) + :TQListViewItem(tqparent, name), m_dom(dom), m_part(part) { } -FunctionItem::FunctionItem(ClassViewPart *part, TQListViewItem *parent, TQString name, FunctionDom dom) - :TQListViewItem(parent, name), m_dom(dom), m_part(part) +FunctionItem::FunctionItem(ClassViewPart *part, TQListViewItem *tqparent, TQString name, FunctionDom dom) + :TQListViewItem(tqparent, name), m_dom(dom), m_part(part) { } diff --git a/parts/classview/viewcombos.h b/parts/classview/viewcombos.h index 7525a5d8..c3ea79a2 100644 --- a/parts/classview/viewcombos.h +++ b/parts/classview/viewcombos.h @@ -32,10 +32,10 @@ class KComboView; const TQString EmptyClasses = i18n("(Classes)"); const TQString EmptyFunctions = i18n("(Functions)"); -class NamespaceItem: public QListViewItem{ +class NamespaceItem: public TQListViewItem{ public: - NamespaceItem(ClassViewPart *part, TQListView *parent, TQString name, NamespaceDom dom); - NamespaceItem(ClassViewPart *part, TQListViewItem *parent, TQString name, NamespaceDom dom); + NamespaceItem(ClassViewPart *part, TQListView *tqparent, TQString name, NamespaceDom dom); + NamespaceItem(ClassViewPart *part, TQListViewItem *tqparent, TQString name, NamespaceDom dom); ~NamespaceItem(); NamespaceDom dom() const; virtual void setup(); @@ -44,10 +44,10 @@ private: ClassViewPart *m_part; }; -class ClassItem: public QListViewItem{ +class ClassItem: public TQListViewItem{ public: - ClassItem(ClassViewPart *part, TQListView *parent, TQString name, ClassDom dom); - ClassItem(ClassViewPart *part, TQListViewItem *parent, TQString name, ClassDom dom); + ClassItem(ClassViewPart *part, TQListView *tqparent, TQString name, ClassDom dom); + ClassItem(ClassViewPart *part, TQListViewItem *tqparent, TQString name, ClassDom dom); ~ClassItem(); ClassDom dom() const; virtual void setup(); @@ -56,10 +56,10 @@ private: ClassViewPart *m_part; }; -class FunctionItem: public QListViewItem{ +class FunctionItem: public TQListViewItem{ public: - FunctionItem(ClassViewPart *part, TQListView *parent, TQString name, FunctionDom dom); - FunctionItem(ClassViewPart *part, TQListViewItem *parent, TQString name, FunctionDom dom); + FunctionItem(ClassViewPart *part, TQListView *tqparent, TQString name, FunctionDom dom); + FunctionItem(ClassViewPart *part, TQListViewItem *tqparent, TQString name, FunctionDom dom); ~FunctionItem(); FunctionDom dom() const; virtual void setup(); -- cgit v1.2.3