From d6f8bbb45b267065a6907e71ff9c98bb6d161241 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:56:07 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1157658 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- parts/quickopen/quickopen_part.cpp | 14 +++---- parts/quickopen/quickopen_part.h | 4 +- parts/quickopen/quickopenclassdialog.cpp | 40 ++++++++++---------- parts/quickopen/quickopenclassdialog.h | 22 +++++------ parts/quickopen/quickopendialog.cpp | 42 ++++++++++----------- parts/quickopen/quickopendialog.h | 18 ++++----- parts/quickopen/quickopenfiledialog.cpp | 18 ++++----- parts/quickopen/quickopenfiledialog.h | 8 ++-- parts/quickopen/quickopenfunctionchooseform.cpp | 2 +- parts/quickopen/quickopenfunctionchooseform.h | 8 ++-- parts/quickopen/quickopenfunctiondialog.cpp | 50 ++++++++++++------------- parts/quickopen/quickopenfunctiondialog.h | 12 +++--- 12 files changed, 119 insertions(+), 119 deletions(-) (limited to 'parts/quickopen') diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp index 66b18df2..2c1de0ce 100644 --- a/parts/quickopen/quickopen_part.cpp +++ b/parts/quickopen/quickopen_part.cpp @@ -49,33 +49,33 @@ K_EXPORT_COMPONENT_FACTORY( libkdevquickopen, QuickOpenFactory( data ) ) using namespace KTextEditor; -QuickOpenPart::QuickOpenPart(QObject *parent, const char *name, const QStringList& ) +QuickOpenPart::QuickOpenPart(TQObject *parent, const char *name, const TQStringList& ) : KDevQuickOpen(&data, parent, name ? name : "QuickOpenPart" ) { setInstance(QuickOpenFactory::instance()); setXMLFile("kdevpart_quickopen.rc"); m_actionQuickOpen = new KAction( i18n("Quick Open File..."), CTRL + ALT + Key_O, - this, SLOT(slotQuickFileOpen()), + this, TQT_SLOT(slotQuickFileOpen()), actionCollection(), "quick_open" ); m_actionQuickOpen->setToolTip(i18n("Quick open file in project")); m_actionQuickOpen->setWhatsThis(i18n("Quick open

Provides a file name input form with completion listbox to quickly open file in a project.")); m_actionQuickOpenClass = new KAction( i18n("Quick Open Class..."), CTRL + ALT + Key_C, - this, SLOT(slotQuickOpenClass()), + this, TQT_SLOT(slotQuickOpenClass()), actionCollection(), "quick_open_class" ); m_actionQuickOpenClass->setToolTip(i18n("Find class in project")); m_actionQuickOpenClass->setWhatsThis(i18n("Find class

Provides a class name input form with completion listbox to quickly open a file where the class is defined.")); - m_actionFunctionOpen = new KAction( i18n("Quick Open Method..."), CTRL + ALT + Key_M, this, SLOT(slotQuickOpenFunction()), actionCollection(), "quick_open_function" ); + m_actionFunctionOpen = new KAction( i18n("Quick Open Method..."), CTRL + ALT + Key_M, this, TQT_SLOT(slotQuickOpenFunction()), actionCollection(), "quick_open_function" ); m_actionFunctionOpen->setToolTip(i18n("Quick open function in project")); - m_switchToAction = new KAction(i18n("Switch To..."), KShortcut("CTRL+/"), this, SLOT(slotSwitchTo()), actionCollection(), "file_switchto"); + m_switchToAction = new KAction(i18n("Switch To..."), KShortcut("CTRL+/"), this, TQT_SLOT(slotSwitchTo()), actionCollection(), "file_switchto"); m_switchToAction->setToolTip(i18n("Switch to")); m_switchToAction->setWhatsThis(i18n("Switch to

Prompts to enter the name of previously opened file to switch to.")); - connect( core(), SIGNAL(projectOpened()), this, SLOT(slotProjectOpened()) ); - connect( core(), SIGNAL(projectClosed()), this, SLOT(slotProjectClosed()) ); + connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); + connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); } diff --git a/parts/quickopen/quickopen_part.h b/parts/quickopen/quickopen_part.h index 92dac902..19d92222 100644 --- a/parts/quickopen/quickopen_part.h +++ b/parts/quickopen/quickopen_part.h @@ -21,7 +21,7 @@ #ifndef __KDEVPART_QUICKOPEN_H__ #define __KDEVPART_QUICKOPEN_H__ -#include +#include #include #include @@ -31,7 +31,7 @@ class QuickOpenPart : public KDevQuickOpen { Q_OBJECT public: - QuickOpenPart(QObject *parent, const char *name, const QStringList &); + QuickOpenPart(TQObject *parent, const char *name, const TQStringList &); virtual ~QuickOpenPart(); void selectItem( ItemDom item ); diff --git a/parts/quickopen/quickopenclassdialog.cpp b/parts/quickopen/quickopenclassdialog.cpp index 0d5b2251..b97e47a3 100644 --- a/parts/quickopen/quickopenclassdialog.cpp +++ b/parts/quickopen/quickopenclassdialog.cpp @@ -28,14 +28,14 @@ #include #include -#include -#include +#include +#include #include "quickopenclassdialog.h" #include "quickopen_part.h" #include "quickopenfunctionchooseform.h" -QuickOpenClassDialog::QuickOpenClassDialog(QuickOpenPart* part, QWidget* parent, const char* name, bool modal, WFlags fl) +QuickOpenClassDialog::QuickOpenClassDialog(QuickOpenPart* part, TQWidget* parent, const char* name, bool modal, WFlags fl) : QuickOpenDialog( part, parent, name, modal, fl ) { nameLabel->setText( i18n("Class &name:") ); @@ -54,14 +54,14 @@ QuickOpenClassDialog::~QuickOpenClassDialog() { } -void QuickOpenClassDialog::slotExecuted( QListBoxItem* /*item*/ ) +void QuickOpenClassDialog::slotExecuted( TQListBoxItem* /*item*/ ) { accept(); } void QuickOpenClassDialog::accept() { - if( QListBoxItem* item = itemList->selectedItem() ) + if( TQListBoxItem* item = itemList->selectedItem() ) { ClassList klasses = findClass( item->text() ); if( klasses.count() == 1 ) @@ -75,7 +75,7 @@ void QuickOpenClassDialog::accept() else if (klasses.count() > 1 ) { //several classes with the same name found - QString fileStr; + TQString fileStr; QuickOpenFunctionChooseForm fdlg( this, "" ); fdlg.setCaption(i18n("Select The Location of Class %1").arg(klasses.first()->name())); @@ -85,7 +85,7 @@ void QuickOpenClassDialog::accept() { ClassDom klass = *it; //assemble class name to display (maybe with scope info and specialization) - QString classStr = m_part->languageSupport()->formatModelItem(klass); + TQString classStr = m_part->languageSupport()->formatModelItem(klass); if(klass->hasSpecializationDeclaration()) classStr += klass->getSpecializationDeclaration(); if(!klass->scope().isEmpty()) @@ -106,14 +106,14 @@ void QuickOpenClassDialog::accept() int line, col; model->getStartPosition( &line, &col ); selectClassViewItem( ItemDom(&(*model)) ); - QString fileNameStr = model->fileName(); + TQString fileNameStr = model->fileName(); m_part->partController()->editDocument( KURL(fileNameStr), line ); } } } } - QDialog::accept(); + TQDialog::accept(); } void QuickOpenClassDialog::slotReturnPressed( ) @@ -122,14 +122,14 @@ void QuickOpenClassDialog::slotReturnPressed( ) accept(); } -void QuickOpenClassDialog::findAllClasses( QStringList& lst ) +void QuickOpenClassDialog::findAllClasses( TQStringList& lst ) { findAllClasses( lst, m_part->codeModel()->globalNamespace() ); } -void QuickOpenClassDialog::findAllClasses( QStringList& lst, const ClassDom klass ) +void QuickOpenClassDialog::findAllClasses( TQStringList& lst, const ClassDom klass ) { - QStringList fullName = klass->scope(); + TQStringList fullName = klass->scope(); fullName << klass->name(); lst << fullName.join( "::" ); @@ -138,7 +138,7 @@ void QuickOpenClassDialog::findAllClasses( QStringList& lst, const ClassDom klas findAllClasses( lst, *it ); } -void QuickOpenClassDialog::findAllClasses( QStringList& lst, const NamespaceDom ns ) +void QuickOpenClassDialog::findAllClasses( TQStringList& lst, const NamespaceDom ns ) { const NamespaceList namespaceList = ns->namespaceList(); for( NamespaceList::ConstIterator it=namespaceList.begin(); it!=namespaceList.end(); ++it ) @@ -149,19 +149,19 @@ void QuickOpenClassDialog::findAllClasses( QStringList& lst, const NamespaceDom findAllClasses( lst, *it ); } -ClassList QuickOpenClassDialog::findClass( const QString& name ) +ClassList QuickOpenClassDialog::findClass( const TQString& name ) { - QStringList path = QStringList::split( "::", name ); + TQStringList path = TQStringList::split( "::", name ); return findClass( path, m_part->codeModel()->globalNamespace() ); } -ClassList QuickOpenClassDialog::findClass( QStringList& path, const NamespaceDom ns ) +ClassList QuickOpenClassDialog::findClass( TQStringList& path, const NamespaceDom ns ) { ClassList list; if( path.isEmpty() ) return list; - QString current = path.front(); + TQString current = path.front(); if( ns->hasNamespace(current) ) { path.pop_front(); @@ -178,7 +178,7 @@ ClassList QuickOpenClassDialog::findClass( QStringList& path, const NamespaceDom return list; } -ClassList QuickOpenClassDialog::findClass( QStringList& path, const ClassList klasses ) +ClassList QuickOpenClassDialog::findClass( TQStringList& path, const ClassList klasses ) { ClassList list; if( path.isEmpty() ) @@ -195,7 +195,7 @@ ClassList QuickOpenClassDialog::findClass( QStringList& path, const ClassList kl return list; } -ClassList QuickOpenClassDialog::findClass( QStringList &path, const ClassDom klass ) +ClassList QuickOpenClassDialog::findClass( TQStringList &path, const ClassDom klass ) { ClassList list; if( path.isEmpty() ) @@ -204,7 +204,7 @@ ClassList QuickOpenClassDialog::findClass( QStringList &path, const ClassDom kla return list; } - QString current = path.front(); + TQString current = path.front(); if( klass->hasClass(current) ) { path.pop_front(); diff --git a/parts/quickopen/quickopenclassdialog.h b/parts/quickopen/quickopenclassdialog.h index a93125c4..fd01fe25 100644 --- a/parts/quickopen/quickopenclassdialog.h +++ b/parts/quickopen/quickopenclassdialog.h @@ -23,7 +23,7 @@ #include "quickopendialog.h" #include -#include +#include class QuickOpenPart; @@ -31,22 +31,22 @@ class QuickOpenClassDialog : public QuickOpenDialog { Q_OBJECT public: - QuickOpenClassDialog(QuickOpenPart* part, QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); + QuickOpenClassDialog(QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); virtual ~QuickOpenClassDialog(); public slots: - virtual void slotExecuted( QListBoxItem* ); + virtual void slotExecuted( TQListBoxItem* ); virtual void slotReturnPressed(); protected: - void findAllClasses( QStringList& classList ); - void findAllClasses( QStringList& classList, const ClassDom klass ); - void findAllClasses( QStringList& classList, const NamespaceDom ns ); - - ClassList findClass( const QString& name ); - ClassList findClass( QStringList& path, const NamespaceDom ns ); - ClassList findClass( QStringList& path, const ClassList klasses ); - ClassList findClass( QStringList& path, const ClassDom klass ); + void findAllClasses( TQStringList& classList ); + void findAllClasses( TQStringList& classList, const ClassDom klass ); + void findAllClasses( TQStringList& classList, const NamespaceDom ns ); + + ClassList findClass( const TQString& name ); + ClassList findClass( TQStringList& path, const NamespaceDom ns ); + ClassList findClass( TQStringList& path, const ClassList klasses ); + ClassList findClass( TQStringList& path, const ClassDom klass ); protected slots: virtual void accept(); diff --git a/parts/quickopen/quickopendialog.cpp b/parts/quickopen/quickopendialog.cpp index b18ab980..e0d40295 100644 --- a/parts/quickopen/quickopendialog.cpp +++ b/parts/quickopen/quickopendialog.cpp @@ -18,8 +18,8 @@ * */ -#include -#include +#include +#include #include #include @@ -28,18 +28,18 @@ #include "quickopendialog.h" #include "quickopen_part.h" -QuickOpenDialog::QuickOpenDialog(QuickOpenPart* part, QWidget* parent, const char* name, bool modal, WFlags fl) +QuickOpenDialog::QuickOpenDialog(QuickOpenPart* part, TQWidget* parent, const char* name, bool modal, WFlags fl) : QuickOpenDialogBase( parent, name, modal, fl ), m_part( part ) { nameEdit->installEventFilter(this); - connect( &m_typeTimeout, SIGNAL(timeout()), this, SLOT(slotTextChangedDelayed()) ); + connect( &m_typeTimeout, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTextChangedDelayed()) ); } QuickOpenDialog::~QuickOpenDialog() { } -void QuickOpenDialog::slotTextChanged(const QString &) +void QuickOpenDialog::slotTextChanged(const TQString &) { m_typeTimeout.start( 100, true ); } @@ -58,8 +58,8 @@ void QuickOpenDialog::setFirstItemSelected() itemList->setCurrentItem(0); // We are doing this indirectly because the event handler does things for multiple // selections we cannot do through the public interface. - QKeyEvent e(QEvent::KeyPress, Qt::Key_Home, 0, 0); - QApplication::sendEvent(itemList, &e); + TQKeyEvent e(TQEvent::KeyPress, Qt::Key_Home, 0, 0); + TQApplication::sendEvent(itemList, &e); } void QuickOpenDialog::slotTextChangedDelayed() @@ -69,38 +69,38 @@ void QuickOpenDialog::slotTextChangedDelayed() setFirstItemSelected(); } -bool QuickOpenDialog::eventFilter( QObject * watched, QEvent * e ) +bool QuickOpenDialog::eventFilter( TQObject * watched, TQEvent * e ) { if (!watched || !e) return true; - if ((watched == nameEdit) && (e->type() == QEvent::KeyPress)) + if ((watched == nameEdit) && (e->type() == TQEvent::KeyPress)) { - QKeyEvent *ke = (QKeyEvent*)e; + TQKeyEvent *ke = (TQKeyEvent*)e; if (ke->key() == Key_Up) { - QApplication::sendEvent(itemList, e); + TQApplication::sendEvent(itemList, e); nameEdit->blockSignals(true); itemSelectionChanged(); nameEdit->blockSignals(false); return true; } else if (ke->key() == Key_Down) { - QApplication::sendEvent(itemList, e); + TQApplication::sendEvent(itemList, e); nameEdit->blockSignals(true); itemSelectionChanged(); nameEdit->blockSignals(false); return true; } else if ((ke->key() == Key_Next) || (ke->key() == Key_Prior)) { - QApplication::sendEvent(itemList, e); + TQApplication::sendEvent(itemList, e); nameEdit->blockSignals(true); itemSelectionChanged(); nameEdit->blockSignals(false); } } - return QWidget::eventFilter(watched, e); + return TQWidget::eventFilter(watched, e); } void QuickOpenDialog::selectClassViewItem(ItemDom item) @@ -108,13 +108,13 @@ void QuickOpenDialog::selectClassViewItem(ItemDom item) m_part->selectItem( item ); } -QStringList QuickOpenDialog::wildCardCompletion(const QString & text) +TQStringList QuickOpenDialog::wildCardCompletion(const TQString & text) { if ( text.isEmpty() ) return m_items; - QRegExp re( text, false, true ); - QStringList matches; - QStringList::const_iterator it = m_items.begin(); + TQRegExp re( text, false, true ); + TQStringList matches; + TQStringList::const_iterator it = m_items.begin(); while( it != m_items.end() ) { if ( (*it).find( re ) != -1 ) @@ -127,14 +127,14 @@ QStringList QuickOpenDialog::wildCardCompletion(const QString & text) return matches; } -void QuickOpenDialog::QStringList_unique( QStringList & list ) +void QuickOpenDialog::QStringList_unique( TQStringList & list ) { if ( list.size() < 2 ) return; list.sort(); - QStringList::iterator it = list.begin(); - QStringList::iterator it2 = it; + TQStringList::iterator it = list.begin(); + TQStringList::iterator it2 = it; while ( it2 != list.end() ) { ++it2; diff --git a/parts/quickopen/quickopendialog.h b/parts/quickopen/quickopendialog.h index 00149bc4..6d441684 100644 --- a/parts/quickopen/quickopendialog.h +++ b/parts/quickopen/quickopendialog.h @@ -21,8 +21,8 @@ #ifndef QUICKOPENDIALOG_H #define QUICKOPENDIALOG_H -#include -#include +#include +#include #include @@ -36,26 +36,26 @@ class QuickOpenDialog : public QuickOpenDialogBase Q_OBJECT public: - QuickOpenDialog(QuickOpenPart* part, QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); + QuickOpenDialog(QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); virtual ~QuickOpenDialog(); - virtual bool eventFilter(QObject *watched, QEvent *e); + virtual bool eventFilter(TQObject *watched, TQEvent *e); void selectClassViewItem(ItemDom item); public slots: - virtual void slotTextChanged(const QString&); + virtual void slotTextChanged(const TQString&); virtual void slotTextChangedDelayed(); protected: void maybeUpdateSelection(); void setFirstItemSelected(); virtual void itemSelectionChanged(); - void QStringList_unique( QStringList & list ); - QStringList wildCardCompletion( const QString & text ); - QStringList m_items; + void QStringList_unique( TQStringList & list ); + TQStringList wildCardCompletion( const TQString & text ); + TQStringList m_items; QuickOpenPart* m_part; - QTimer m_typeTimeout; + TQTimer m_typeTimeout; }; diff --git a/parts/quickopen/quickopenfiledialog.cpp b/parts/quickopen/quickopenfiledialog.cpp index a03236b4..adc4a919 100644 --- a/parts/quickopen/quickopenfiledialog.cpp +++ b/parts/quickopen/quickopenfiledialog.cpp @@ -29,13 +29,13 @@ #include -#include -#include +#include +#include #include "quickopenfiledialog.h" #include "quickopen_part.h" -QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, QWidget* parent, const char* name, bool modal, WFlags fl) +QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, TQWidget* parent, const char* name, bool modal, WFlags fl) : QuickOpenDialog( part, parent, name, modal, fl ), m_hasFullPaths( false ) { nameLabel->setText( i18n("File &name:") ); @@ -45,12 +45,12 @@ QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, QWidget* parent, c nameEdit->setFocus(); - itemList->setSelectionMode( QListBox::Extended ); + itemList->setSelectionMode( TQListBox::Extended ); itemList->insertStringList( m_items ); setFirstItemSelected(); } -QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, const KURL::List & urls, QWidget* parent, const char* name, bool modal, WFlags fl) +QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, const KURL::List & urls, TQWidget* parent, const char* name, bool modal, WFlags fl) : QuickOpenDialog( part, parent, name, modal, fl ), m_hasFullPaths( true ) { nameLabel->setText( i18n("File &name:") ); @@ -63,8 +63,8 @@ QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, const KURL::List & { for (unsigned int i = 0; i < m_items.count(); ++i) { - QString url = m_items[i]; - QString projectUrl = "file://" + m_part->project()->projectDirectory(); + TQString url = m_items[i]; + TQString projectUrl = "file://" + m_part->project()->projectDirectory(); if (url.startsWith(projectUrl)) m_items[i] = url.mid(projectUrl.length() + 1); } @@ -72,7 +72,7 @@ QuickOpenFileDialog::QuickOpenFileDialog(QuickOpenPart* part, const KURL::List & nameEdit->setFocus(); - itemList->setSelectionMode( QListBox::Extended ); + itemList->setSelectionMode( TQListBox::Extended ); itemList->insertStringList( m_items ); setFirstItemSelected(); } @@ -81,7 +81,7 @@ QuickOpenFileDialog::~QuickOpenFileDialog() { } -void QuickOpenFileDialog::slotExecuted( QListBoxItem* item ) +void QuickOpenFileDialog::slotExecuted( TQListBoxItem* item ) { if ( !item ) return; diff --git a/parts/quickopen/quickopenfiledialog.h b/parts/quickopen/quickopenfiledialog.h index 105b5efd..852f0f5b 100644 --- a/parts/quickopen/quickopenfiledialog.h +++ b/parts/quickopen/quickopenfiledialog.h @@ -22,7 +22,7 @@ #define QUICKOPENFILEDIALOG_H #include "quickopendialog.h" -#include +#include #include @@ -33,12 +33,12 @@ class QuickOpenFileDialog : public QuickOpenDialog { Q_OBJECT public: - QuickOpenFileDialog(QuickOpenPart* part, QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); - QuickOpenFileDialog(QuickOpenPart* part, const KURL::List &, QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); + QuickOpenFileDialog(QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); + QuickOpenFileDialog(QuickOpenPart* part, const KURL::List &, TQWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0 ); virtual ~QuickOpenFileDialog(); public slots: - virtual void slotExecuted( QListBoxItem* ); + virtual void slotExecuted( TQListBoxItem* ); virtual void slotReturnPressed(); private: diff --git a/parts/quickopen/quickopenfunctionchooseform.cpp b/parts/quickopen/quickopenfunctionchooseform.cpp index a2c50776..a8853417 100644 --- a/parts/quickopen/quickopenfunctionchooseform.cpp +++ b/parts/quickopen/quickopenfunctionchooseform.cpp @@ -28,7 +28,7 @@ #include "quickopenfunctionchooseform.h" -QuickOpenFunctionChooseForm::QuickOpenFunctionChooseForm(QWidget* parent, const char* name, bool modal, WFlags fl) +QuickOpenFunctionChooseForm::QuickOpenFunctionChooseForm(TQWidget* parent, const char* name, bool modal, WFlags fl) : QuickOpenFunctionChooseFormBase(parent,name, modal,fl) { setCaption( i18n("Select One Argument or File of Function %1").arg( name ) ); diff --git a/parts/quickopen/quickopenfunctionchooseform.h b/parts/quickopen/quickopenfunctionchooseform.h index 9048c24f..b8d462a5 100644 --- a/parts/quickopen/quickopenfunctionchooseform.h +++ b/parts/quickopen/quickopenfunctionchooseform.h @@ -23,24 +23,24 @@ #include "quickopenfunctionchooseformbase.h" -#include +#include class QuickOpenFunctionChooseForm : public QuickOpenFunctionChooseFormBase { Q_OBJECT public: - QuickOpenFunctionChooseForm(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + QuickOpenFunctionChooseForm(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~QuickOpenFunctionChooseForm(); - void setRelativePath(int id, const QString &path) { m_relPaths[id] = path; } + void setRelativePath(int id, const TQString &path) { m_relPaths[id] = path; } public slots: virtual void slotArgsChange( int id ); virtual void slotFileChange( int id ); private: - QMap m_relPaths; + TQMap m_relPaths; }; diff --git a/parts/quickopen/quickopenfunctiondialog.cpp b/parts/quickopen/quickopenfunctiondialog.cpp index d8691d92..8b877b8b 100644 --- a/parts/quickopen/quickopenfunctiondialog.cpp +++ b/parts/quickopen/quickopenfunctiondialog.cpp @@ -19,8 +19,8 @@ */ #include -#include -#include +#include +#include #include #include @@ -33,13 +33,13 @@ #include #include #include -#include +#include #include "quickopenfunctionchooseform.h" #include "quickopenfunctiondialog.h" -QuickOpenFunctionDialog::QuickOpenFunctionDialog( QuickOpenPart *part, QWidget* parent, const char* name, bool modal, WFlags fl) +QuickOpenFunctionDialog::QuickOpenFunctionDialog( QuickOpenPart *part, TQWidget* parent, const char* name, bool modal, WFlags fl) : QuickOpenDialog(part, parent, name, modal, fl) { nameLabel->setText( i18n("Function &name:") ); @@ -81,7 +81,7 @@ QuickOpenFunctionDialog::~QuickOpenFunctionDialog() { } -void QuickOpenFunctionDialog::gotoFile( QString name ) +void QuickOpenFunctionDialog::gotoFile( TQString name ) { FunctionModel *fmodel; FunctionList funcList; @@ -97,14 +97,14 @@ void QuickOpenFunctionDialog::gotoFile( QString name ) if( funcList.count() == 1 ){ fdom = funcList.first(); fmodel = fdom.data(); - QString fileNameStr = fmodel->fileName(); + TQString fileNameStr = fmodel->fileName(); int startline, startcol; fmodel->getStartPosition( &startline, &startcol ); m_part->partController()->editDocument( KURL( fileNameStr), startline, startcol ); selectClassViewItem( ItemDom(&(*fmodel)) ); }else if( funcList.count() > 1 ){ - QString fileStr; + TQString fileStr; QuickOpenFunctionChooseForm fdlg( this, name.ascii() ); @@ -127,7 +127,7 @@ void QuickOpenFunctionDialog::gotoFile( QString name ) int line, col; model->getStartPosition( &line, &col ); selectClassViewItem( ItemDom(&(*model)) ); - QString fileNameStr = model->fileName(); + TQString fileNameStr = model->fileName(); m_part->partController()->editDocument( KURL(fileNameStr), line ); } } @@ -139,21 +139,21 @@ void QuickOpenFunctionDialog::gotoFile( QString name ) accept(); } -void QuickOpenFunctionDialog::slotExecuted(QListBoxItem* item) +void QuickOpenFunctionDialog::slotExecuted(TQListBoxItem* item) { if( item ){ gotoFile( item->text() ); } } -void QuickOpenFunctionDialog::executed(QListBoxItem*) +void QuickOpenFunctionDialog::executed(TQListBoxItem*) { } void QuickOpenFunctionDialog::itemSelectionChanged() { - QString text = nameEdit->text(); - QString txt = text; - QStringList parts = QStringList::split("::", text); + TQString text = nameEdit->text(); + TQString txt = text; + TQStringList parts = TQStringList::split("::", text); if( !text.endsWith( "::" ) && !parts.isEmpty() ) parts.pop_back(); parts << itemList->currentText(); @@ -161,21 +161,21 @@ void QuickOpenFunctionDialog::itemSelectionChanged() { } void QuickOpenFunctionDialog::slotTextChangedDelayed() { - QString text = nameEdit->text(); - QString txt = text; - QStringList parts = QStringList::split("::", text); + TQString text = nameEdit->text(); + TQString txt = text; + TQStringList parts = TQStringList::split("::", text); if(text.endsWith("::") || parts.isEmpty()) { txt = ""; }else{ txt = parts.back(); parts.pop_back(); } - QValueList regExpParts; - for( QStringList::const_iterator it = parts.begin(); it != parts.end(); ++it ) { - regExpParts << QRegExp( *it, false, true ); + TQValueList regExpParts; + for( TQStringList::const_iterator it = parts.begin(); it != parts.end(); ++it ) { + regExpParts << TQRegExp( *it, false, true ); } - QString scope = parts.join("::"); + TQString scope = parts.join("::"); if( m_scope != scope ) { if( !scope.startsWith(m_scope) ) { ///Not a specialization, so reload all function-definitions @@ -184,12 +184,12 @@ void QuickOpenFunctionDialog::slotTextChangedDelayed() { if(!parts.isEmpty()) { FunctionList accepted; - QStringList acceptedItems; + TQStringList acceptedItems; FunctionList::iterator it = m_functionDefList.begin(); while(it != m_functionDefList.end()) { - QStringList scope = (*it)->scope(); - QValueList::iterator mit = regExpParts.begin(); - QStringList::iterator sit = scope.begin(); + TQStringList scope = (*it)->scope(); + TQValueList::iterator mit = regExpParts.begin(); + TQStringList::iterator sit = scope.begin(); bool fail = false; while(mit != regExpParts.end()) { while(sit != scope.end() && !(*mit).exactMatch( *sit ) ) ++sit; @@ -221,7 +221,7 @@ void QuickOpenFunctionDialog::slotTextChangedDelayed() { void QuickOpenFunctionDialog::slotReturnPressed() { maybeUpdateSelection(); - QListBoxItem *listboxItem = itemList->selectedItem(); + TQListBoxItem *listboxItem = itemList->selectedItem(); slotExecuted( listboxItem ); } diff --git a/parts/quickopen/quickopenfunctiondialog.h b/parts/quickopen/quickopenfunctiondialog.h index 93bb9b12..c02a9296 100644 --- a/parts/quickopen/quickopenfunctiondialog.h +++ b/parts/quickopen/quickopenfunctiondialog.h @@ -34,25 +34,25 @@ class QuickOpenFunctionDialog : public QuickOpenDialog Q_OBJECT public: - QuickOpenFunctionDialog( QuickOpenPart* part, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + QuickOpenFunctionDialog( QuickOpenPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~QuickOpenFunctionDialog(); - void gotoFile( QString name ); + void gotoFile( TQString name ); QuickOpenPart* part(){ return m_part; }; public slots: - virtual void slotExecuted(QListBoxItem*);//itemList executed, returnPressed - virtual void executed(QListBoxItem*); // + virtual void slotExecuted(TQListBoxItem*);//itemList executed, returnPressed + virtual void executed(TQListBoxItem*); // virtual void slotReturnPressed(); //buttonOk clicked, nameEdit returnPressed virtual void slotTextChangedDelayed(); virtual void itemSelectionChanged(); protected: void fillItemList(); - QString m_scope; + TQString m_scope; FunctionList m_functionDefList; - QStringList m_functionStrList; + TQStringList m_functionStrList; }; -- cgit v1.2.3