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 --- .../pcsimporter/qt4importer/kdevqt4importer.cpp | 28 ++++++++-------- .../cpp/pcsimporter/qt4importer/kdevqt4importer.h | 14 ++++---- .../cpp/pcsimporter/qt4importer/settingsdialog.cpp | 38 +++++++++++----------- .../cpp/pcsimporter/qt4importer/settingsdialog.h | 10 +++--- 4 files changed, 45 insertions(+), 45 deletions(-) (limited to 'languages/cpp/pcsimporter/qt4importer') diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp index f4fedea0..d4635ba4 100644 --- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp @@ -18,13 +18,13 @@ #include #include -#include -#include -#include +#include +#include +#include K_EXPORT_COMPONENT_FACTORY( libkdevqt4importer, KGenericFactory( "kdevqt4importer" ) ) -KDevQt4Importer::KDevQt4Importer( QObject * parent, const char * name, const QStringList& ) +KDevQt4Importer::KDevQt4Importer( TQObject * parent, const char * name, const TQStringList& ) : KDevPCSImporter( parent, name ) { m_qtfile = 0; @@ -38,16 +38,16 @@ KDevQt4Importer::~KDevQt4Importer() m_qtfile = 0; } -QStringList KDevQt4Importer::fileList() +TQStringList KDevQt4Importer::fileList() { if( !m_settings ) - return QStringList(); + return TQStringList(); if (m_qtfile) delete m_qtfile; KTempFile ifile; - QTextStream &is = *ifile.textStream(); + TQTextStream &is = *ifile.textStream(); is << "#include \n" << "#undef Q_SLOTS\n#undef Q_SIGNALS\n#undef slots\n#undef signals" @@ -70,13 +70,13 @@ QStringList KDevQt4Importer::fileList() m_qtfile = new KTempFile(); // include paths - QStringList paths = includePaths(); - for (QStringList::Iterator it = paths.begin(); it != paths.end(); ++it) + TQStringList paths = includePaths(); + for (TQStringList::Iterator it = paths.begin(); it != paths.end(); ++it) proc << "-I" << *it; ifile.close(); - QString o; + TQString o; o += "-o"; o += m_qtfile->name(); @@ -86,12 +86,12 @@ QStringList KDevQt4Importer::fileList() return m_qtfile->name(); } -QStringList KDevQt4Importer::includePaths() +TQStringList KDevQt4Importer::includePaths() { if( !m_settings || !m_qtfile) - return QStringList(); + return TQStringList(); - QStringList includePaths; + TQStringList includePaths; includePaths.push_back( m_settings->qtDir() ); includePaths.push_back( m_settings->qtDir() + "/Qt" ); @@ -99,7 +99,7 @@ QStringList KDevQt4Importer::includePaths() return includePaths; } -QWidget * KDevQt4Importer::createSettingsPage( QWidget * parent, const char * name ) +TQWidget * KDevQt4Importer::createSettingsPage( TQWidget * parent, const char * name ) { m_settings = new SettingsDialog( parent, name ); return m_settings; diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h index 821e6fef..c430db19 100644 --- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h @@ -13,7 +13,7 @@ #define KDEVQTIMPORTER_H #include -#include +#include class SettingsDialog; class KTempFile; @@ -22,17 +22,17 @@ class KDevQt4Importer : public KDevPCSImporter { Q_OBJECT public: - KDevQt4Importer( QObject* parent=0, const char* name=0, const QStringList& args=QStringList() ); + KDevQt4Importer( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); virtual ~KDevQt4Importer(); - virtual QString dbName() const { return QString::fromLatin1("Qt4"); } - virtual QStringList fileList(); - virtual QStringList includePaths(); + virtual TQString dbName() const { return TQString::fromLatin1("Qt4"); } + 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; KTempFile *m_qtfile; }; diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp index cc59c6e9..755b14c4 100644 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp @@ -20,34 +20,34 @@ #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") ); - qtdirs.push_back( QString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt/include" ); - qtdirs.push_back( QString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt-main/include" ); + TQStringList qtdirs; + qtdirs.push_back( ::getenv("QTDIR") + TQString("/include") ); + qtdirs.push_back( TQString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt/include" ); + qtdirs.push_back( TQString::fromLocal8Bit(::getenv("HOME")) + "/dev/qt-main/include" ); qtdirs.push_back( "/usr/qt/4/include" ); - 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 ); @@ -55,14 +55,14 @@ 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* item) +void SettingsDialog::slotSelectionChanged(TQListBoxItem* item) { if( !qtListBox->selectedItem() ) { @@ -74,17 +74,17 @@ void SettingsDialog::slotSelectionChanged(QListBoxItem* item) emit enabled( true ); } -bool SettingsDialog::isValidQtDir( const QString & path ) const +bool SettingsDialog::isValidQtDir( const TQString & path ) const { - return QFile::exists( path + "/QtCore/QtCore" ); + return TQFile::exists( path + "/QtCore/QtCore" ); } -QString SettingsDialog::qtDir( ) const +TQString SettingsDialog::qtDir( ) const { return qtListBox->currentText(); } -QString SettingsDialog::configuration( ) const +TQString SettingsDialog::configuration( ) const { return ""; } @@ -96,7 +96,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/qt4importer/settingsdialog.h b/languages/cpp/pcsimporter/qt4importer/settingsdialog.h index 1ec5663e..118564fb 100644 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.h +++ b/languages/cpp/pcsimporter/qt4importer/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