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 --- .../cpp/pcsimporter/customimporter/kdevcustomimporter.cpp | 10 +++++----- .../cpp/pcsimporter/customimporter/kdevcustomimporter.h | 5 +++-- .../cpp/pcsimporter/customimporter/settingsdialog.cpp | 10 +++++----- languages/cpp/pcsimporter/customimporter/settingsdialog.h | 5 +++-- .../cpp/pcsimporter/customimporter/settingsdialogbase.ui | 14 +++++++------- 5 files changed, 23 insertions(+), 21 deletions(-) (limited to 'languages/cpp/pcsimporter/customimporter') diff --git a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp index 5551cd02..930bcfef 100644 --- a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp +++ b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp @@ -19,9 +19,9 @@ K_EXPORT_COMPONENT_FACTORY( libkdevcustompcsimporter, KGenericFactory( "kdevcustompcsimporter" ) ) -KDevCustomImporter::KDevCustomImporter( TQObject* parent, const char* name, const TQStringList & // args +KDevCustomImporter::KDevCustomImporter( TQObject* tqparent, const char* name, const TQStringList & // args ) - : KDevPCSImporter( parent, name ) + : KDevPCSImporter( tqparent, name ) {} @@ -75,9 +75,9 @@ TQStringList KDevCustomImporter::includePaths() return m_settings->dirs(); } -TQWidget* KDevCustomImporter::createSettingsPage( TQWidget* parent, const char* name ) +TQWidget* KDevCustomImporter::createSettingsPage( TQWidget* tqparent, const char* name ) { - m_settings = new SettingsDialog( parent, name ); + m_settings = new SettingsDialog( tqparent, name ); return m_settings; } @@ -94,7 +94,7 @@ void KDevCustomImporter::processDir( const TQString path, TQStringList & files ) if (!dir.exists()) continue; kdDebug( 9015 ) << "Examining: " << dir.path() << endl; - const QFileInfoList *dirEntries = dir.entryInfoList(); + const TQFileInfoList *dirEntries = dir.entryInfoList(); if ( !dirEntries ) continue; TQPtrListIterator it( *dirEntries ); for ( ; dirEntries && it.current(); ++it ) diff --git a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h index bca53eeb..0aea3974 100644 --- a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h +++ b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h @@ -19,15 +19,16 @@ class SettingsDialog; class KDevCustomImporter : public KDevPCSImporter { Q_OBJECT + TQ_OBJECT public: - KDevCustomImporter(TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + KDevCustomImporter(TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); ~KDevCustomImporter(); virtual TQString dbName() const; virtual TQStringList fileList(); virtual TQStringList includePaths(); - virtual TQWidget* createSettingsPage(TQWidget* parent, const char* name); + virtual TQWidget* createSettingsPage(TQWidget* tqparent, const char* name); protected: TQStringList fileList( const TQString& path ); diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp index 37f2bfef..ebef44ed 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp @@ -34,8 +34,8 @@ #include -SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) - : SettingsDialogBase( parent, name, fl ) +SettingsDialog::SettingsDialog( TQWidget* tqparent, const char* name, WFlags fl ) + : SettingsDialogBase( tqparent, name, fl ) { KURLRequester * req = new KURLRequester( this ); req->setMode( KFile::Directory ); @@ -83,17 +83,17 @@ void SettingsDialog::validate() void SettingsDialog::validateDirectory( const TQString & dir ) { - TQDir d( dir, TQString::null, TQDir::DefaultSort, TQDir::Dirs ); + TQDir d( dir, TQString(), TQDir::DefaultSort, TQDir::Dirs ); if ( !d.exists() ) { elb->lineEdit() ->setText( dir ); - if ( TQListBoxItem * item = elb->listBox() ->findItem( dir, Qt::ExactMatch ) ) + if ( TQListBoxItem * item = elb->listBox() ->tqfindItem( dir, TQt::ExactMatch ) ) { elb->listBox() ->removeItem( elb->listBox() ->index( item ) ); } - TQString errormsg = TQString( "%1 is not a directory" ).arg( dir ); + TQString errormsg = TQString( "%1 is not a directory" ).tqarg( dir ); KMessageBox::error( 0, errormsg, "Couldn't find directory" ); } emit enabled( elb->listBox()->count() > 0 ); diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.h b/languages/cpp/pcsimporter/customimporter/settingsdialog.h index 02336f98..3d683f99 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialog.h +++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.h @@ -19,12 +19,13 @@ class KEditListBox; class SettingsDialog : public SettingsDialogBase { Q_OBJECT + TQ_OBJECT public: - SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + SettingsDialog(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~SettingsDialog(); - bool isValidQtDir( const TQString& path ) const; + bool isValidTQtDir( const TQString& path ) const; TQString qtDir() const; TQString configuration() const; diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui index b9faadb1..a7678844 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui @@ -1,6 +1,6 @@ SettingsDialogBase - + SettingsDialogBase @@ -16,7 +16,7 @@ unnamed - + grid @@ -32,7 +32,7 @@ *.h;*.H;*.hh;*.hxx;*.hpp;*.tlh - + textLabel1_2 @@ -40,7 +40,7 @@ Filename pattern: - + recursive_box @@ -55,8 +55,8 @@ - + enabled(int) - - + + -- cgit v1.2.1