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 --- .../cpp/pcsimporter/qtimporter/kdevqtimporter.cpp | 26 +++++++------- .../cpp/pcsimporter/qtimporter/kdevqtimporter.h | 14 ++++---- .../cpp/pcsimporter/qtimporter/settingsdialog.cpp | 42 +++++++++++----------- .../cpp/pcsimporter/qtimporter/settingsdialog.h | 10 +++--- 4 files changed, 46 insertions(+), 46 deletions(-) (limited to 'languages/cpp/pcsimporter/qtimporter') diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp index add8574a..62eb38fd 100644 --- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp +++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp @@ -15,27 +15,27 @@ #include -#include -#include +#include +#include K_EXPORT_COMPONENT_FACTORY( libkdevqtimporter, KGenericFactory( "kdevqtimporter" ) ) -KDevQtImporter::KDevQtImporter( QObject * parent, const char * name, const QStringList& ) +KDevQtImporter::KDevQtImporter( TQObject * parent, const char * name, const TQStringList& ) : KDevPCSImporter( parent, name ) {} KDevQtImporter::~KDevQtImporter() {} -QStringList KDevQtImporter::fileList() +TQStringList KDevQtImporter::fileList() { if ( !m_settings ) - return QStringList(); + return TQStringList(); - QDir dir( m_settings->qtDir() ); - QStringList lst = dir.entryList( "*.h" ); - QStringList fileList; - for ( QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) + TQDir dir( m_settings->qtDir() ); + TQStringList lst = dir.entryList( "*.h" ); + TQStringList fileList; + for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { if ( ( *it ).startsWith( "qconfig-" ) ) { @@ -50,12 +50,12 @@ QStringList KDevQtImporter::fileList() return fileList; } -QStringList KDevQtImporter::includePaths() +TQStringList KDevQtImporter::includePaths() { if ( !m_settings ) - return QStringList(); + return TQStringList(); - QStringList includePaths; + TQStringList includePaths; includePaths.push_back( m_settings->qtDir() ); includePaths.push_back( m_settings->qtDir() + "/private" ); includePaths.push_back( m_settings->qtDir() + "/default" ); @@ -64,7 +64,7 @@ QStringList KDevQtImporter::includePaths() return includePaths; } -QWidget * KDevQtImporter::createSettingsPage( QWidget * parent, const char * name ) +TQWidget * KDevQtImporter::createSettingsPage( TQWidget * parent, const char * name ) { m_settings = new SettingsDialog( parent, name ); return m_settings; diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h index c53b0a8a..3ae35b96 100644 --- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h +++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h @@ -13,7 +13,7 @@ #define KDEVQTIMPORTER_H #include -#include +#include class SettingsDialog; @@ -21,17 +21,17 @@ class KDevQtImporter : public KDevPCSImporter { Q_OBJECT public: - KDevQtImporter( QObject* parent=0, const char* name=0, const QStringList& args=QStringList() ); + KDevQtImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); virtual ~KDevQtImporter(); - virtual QString dbName() const { return QString::fromLatin1("Qt"); } - virtual QStringList fileList(); - virtual QStringList includePaths(); + virtual TQString dbName() const { return TQString::fromLatin1("Qt"); } + virtual TQStringList fileList(); + virtual TQStringList includePaths(); - virtual QWidget* createSettingsPage( QWidget* parent, const char* name=0 ); + virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 ); private: - QGuardedPtr m_settings; + TQGuardedPtr m_settings; }; #endif diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp index b0db10cc..2df475b7 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp @@ -20,35 +20,35 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include "settingsdialog.h" -QListBoxItem* QListBox_selectedItem( QListBox* cpQListBox ) +TQListBoxItem* QListBox_selectedItem( TQListBox* cpQListBox ) { - if ( cpQListBox->selectionMode() != QListBox::Single ) + if ( cpQListBox->selectionMode() != TQListBox::Single ) return 0; if ( cpQListBox->isSelected( cpQListBox->currentItem() ) ) return cpQListBox->item( cpQListBox->currentItem() ); return 0; } -SettingsDialog::SettingsDialog( QWidget* parent, const char* name, WFlags fl ) +SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) : SettingsDialogBase( parent, name, fl ) { - QStringList qtdirs; - qtdirs.push_back( ::getenv( "QTDIR" ) + QString("/include") ); + TQStringList qtdirs; + qtdirs.push_back( ::getenv( "QTDIR" ) + TQString("/include") ); qtdirs.push_back( "/usr/lib/qt3/include" ); qtdirs.push_back( "/usr/lib/qt/include" ); qtdirs.push_back( "/usr/share/qt3/include" ); qtdirs.push_back( "/usr/qt/3/include" ); // gentoo style - for ( QStringList::Iterator it = qtdirs.begin(); it != qtdirs.end(); ++it ) + for ( TQStringList::Iterator it = qtdirs.begin(); it != qtdirs.end(); ++it ) { - QString qtdir = *it; + TQString qtdir = *it; if ( !qtdir.isEmpty() && isValidQtDir( qtdir ) ) if ( !qtListBox->findItem( qtdir, ExactMatch ) ) qtListBox->insertItem( qtdir ); @@ -56,13 +56,13 @@ SettingsDialog::SettingsDialog( QWidget* parent, const char* name, WFlags fl ) qtUrl->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); - connect( addUrlButton, SIGNAL(clicked()), this, SLOT(addUrlButton_clicked()) ); + connect( addUrlButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addUrlButton_clicked()) ); } SettingsDialog::~SettingsDialog() {} -void SettingsDialog::slotSelectionChanged( QListBoxItem* ) +void SettingsDialog::slotSelectionChanged( TQListBoxItem* ) { if ( !qtListBox->selectedItem() ) { @@ -70,11 +70,11 @@ void SettingsDialog::slotSelectionChanged( QListBoxItem* ) return ; } - QDir dir( qtDir() ); - QStringList qconfigFileList = dir.entryList( "qconfig-*.h" ); + TQDir dir( qtDir() ); + TQStringList qconfigFileList = dir.entryList( "qconfig-*.h" ); qtConfiguration->clear(); - QRegExp rx( "qconfig-(\\w+)\\.h" ); - for ( QStringList::Iterator it = qconfigFileList.begin(); it != qconfigFileList.end(); ++it ) + TQRegExp rx( "qconfig-(\\w+)\\.h" ); + for ( TQStringList::Iterator it = qconfigFileList.begin(); it != qconfigFileList.end(); ++it ) { ( void ) rx.exactMatch( *it ); qtConfiguration->insertItem( rx.cap( 1 ) ); @@ -83,17 +83,17 @@ void SettingsDialog::slotSelectionChanged( QListBoxItem* ) emit enabled( true ); } -bool SettingsDialog::isValidQtDir( const QString & path ) const +bool SettingsDialog::isValidQtDir( const TQString & path ) const { - return QFile::exists( path + "/qt.h" ); + return TQFile::exists( path + "/tqt.h" ); } -QString SettingsDialog::qtDir( ) const +TQString SettingsDialog::qtDir( ) const { return qtListBox->currentText(); } -QString SettingsDialog::configuration( ) const +TQString SettingsDialog::configuration( ) const { return qtConfiguration->currentText(); } @@ -104,7 +104,7 @@ void SettingsDialog::addUrlButton_clicked( ) if ( isValidQtDir( qtUrl->url() ) ) { qtListBox->insertItem( qtUrl->url() ); - if ( QListBoxItem * item = qtListBox->findItem( qtUrl->url(), ExactMatch ) ) + if ( TQListBoxItem * item = qtListBox->findItem( qtUrl->url(), ExactMatch ) ) { qtListBox->setSelected( item, true ); } diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.h b/languages/cpp/pcsimporter/qtimporter/settingsdialog.h index 1ec5663e..118564fb 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.h +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.h @@ -19,18 +19,18 @@ class SettingsDialog : public SettingsDialogBase Q_OBJECT public: - SettingsDialog(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~SettingsDialog(); /*$PUBLIC_FUNCTIONS$*/ - bool isValidQtDir( const QString& path ) const; + bool isValidQtDir( const TQString& path ) const; - QString qtDir() const; - QString configuration() const; + TQString qtDir() const; + TQString configuration() const; public slots: /*$PUBLIC_SLOTS$*/ - virtual void slotSelectionChanged(QListBoxItem*); + virtual void slotSelectionChanged(TQListBoxItem*); protected: /*$PROTECTED_FUNCTIONS$*/ -- cgit v1.2.1