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 --- buildtools/script/scriptnewfiledlg.cpp | 20 ++++++++++---------- buildtools/script/scriptnewfiledlg.h | 5 +++-- buildtools/script/scriptoptionswidget.cpp | 4 ++-- buildtools/script/scriptoptionswidget.h | 3 ++- buildtools/script/scriptoptionswidgetbase.ui | 22 +++++++++++----------- buildtools/script/scriptprojectpart.cpp | 10 +++++----- buildtools/script/scriptprojectpart.h | 3 ++- 7 files changed, 35 insertions(+), 32 deletions(-) (limited to 'buildtools/script') diff --git a/buildtools/script/scriptnewfiledlg.cpp b/buildtools/script/scriptnewfiledlg.cpp index 3bfeeee7..41683113 100644 --- a/buildtools/script/scriptnewfiledlg.cpp +++ b/buildtools/script/scriptnewfiledlg.cpp @@ -30,8 +30,8 @@ ScriptNewFileDialog::ScriptNewFileDialog(ScriptProjectPart *part, - TQWidget *parent, const char *name) - : TQDialog(parent, name, true) + TQWidget *tqparent, const char *name) + : TQDialog(tqparent, name, true) { setCaption(i18n("New File")); @@ -56,14 +56,14 @@ ScriptNewFileDialog::ScriptNewFileDialog(ScriptProjectPart *part, ok_button->setDefault(true); connect( ok_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); connect( cancel_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); - buttonbox->layout(); + buttonbox->tqlayout(); - TQVBoxLayout *layout = new TQVBoxLayout(this, 10, 4); - layout->addWidget(filename_label); - layout->addWidget(filename_edit); - layout->addWidget(usetemplate_box); - layout->addWidget(frame, 0); - layout->addWidget(buttonbox, 0); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 10, 4); + tqlayout->addWidget(filename_label); + tqlayout->addWidget(filename_edit); + tqlayout->addWidget(usetemplate_box); + tqlayout->addWidget(frame, 0); + tqlayout->addWidget(buttonbox, 0); m_part = part; } @@ -76,7 +76,7 @@ ScriptNewFileDialog::~ScriptNewFileDialog() void ScriptNewFileDialog::accept() { TQString fileName = filename_edit->text(); - if (fileName.find('/') != -1) { + if (fileName.tqfind('/') != -1) { KMessageBox::sorry(this, i18n("Please enter the file name without '/' and so on.")); return; } diff --git a/buildtools/script/scriptnewfiledlg.h b/buildtools/script/scriptnewfiledlg.h index 72f433c9..ca60ebd5 100644 --- a/buildtools/script/scriptnewfiledlg.h +++ b/buildtools/script/scriptnewfiledlg.h @@ -19,12 +19,13 @@ class KLineEdit; class ScriptProjectPart; -class ScriptNewFileDialog : public QDialog +class ScriptNewFileDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: - ScriptNewFileDialog( ScriptProjectPart *part, TQWidget *parent=0, const char *name=0 ); + ScriptNewFileDialog( ScriptProjectPart *part, TQWidget *tqparent=0, const char *name=0 ); ~ScriptNewFileDialog(); protected: diff --git a/buildtools/script/scriptoptionswidget.cpp b/buildtools/script/scriptoptionswidget.cpp index d80cd501..5b0e8cf8 100644 --- a/buildtools/script/scriptoptionswidget.cpp +++ b/buildtools/script/scriptoptionswidget.cpp @@ -20,8 +20,8 @@ ScriptOptionsWidget::ScriptOptionsWidget(KDevPlugin *part, - TQWidget *parent, const char *name) - : ScriptOptionsWidgetBase(parent, name) + TQWidget *tqparent, const char *name) + : ScriptOptionsWidgetBase(tqparent, name) { m_part = part; diff --git a/buildtools/script/scriptoptionswidget.h b/buildtools/script/scriptoptionswidget.h index 3dc03058..a93d63d1 100644 --- a/buildtools/script/scriptoptionswidget.h +++ b/buildtools/script/scriptoptionswidget.h @@ -20,9 +20,10 @@ class KDevPlugin; class ScriptOptionsWidget : public ScriptOptionsWidgetBase { Q_OBJECT + TQ_OBJECT public: - ScriptOptionsWidget( KDevPlugin *part, TQWidget *parent=0, const char *name=0 ); + ScriptOptionsWidget( KDevPlugin *part, TQWidget *tqparent=0, const char *name=0 ); ~ScriptOptionsWidget(); public slots: diff --git a/buildtools/script/scriptoptionswidgetbase.ui b/buildtools/script/scriptoptionswidgetbase.ui index 3a8f7b99..a73c8683 100644 --- a/buildtools/script/scriptoptionswidgetbase.ui +++ b/buildtools/script/scriptoptionswidgetbase.ui @@ -1,6 +1,6 @@ ScriptOptionsWidgetBase - + script_project_options @@ -19,7 +19,7 @@ unnamed - + includepatterns_label @@ -30,7 +30,7 @@ includepatterns_edit - + Layout2 @@ -51,7 +51,7 @@ Minimum - + 20 20 @@ -75,14 +75,14 @@ Minimum - + 20 20 - + excludepatterns_label @@ -93,7 +93,7 @@ excludepatterns_edit - + Layout2_2 @@ -114,7 +114,7 @@ Minimum - + 20 20 @@ -138,7 +138,7 @@ Expanding - + 20 20 @@ -150,6 +150,6 @@ kdialog.h - - + + diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp index 2bc19135..e28ef2e4 100644 --- a/buildtools/script/scriptprojectpart.cpp +++ b/buildtools/script/scriptprojectpart.cpp @@ -40,8 +40,8 @@ typedef KDevGenericFactory ScriptProjectFactory; static const KDevPluginInfo data("kdevscriptproject"); K_EXPORT_COMPONENT_FACTORY( libkdevscriptproject, ScriptProjectFactory( data ) ) -ScriptProjectPart::ScriptProjectPart(TQObject *parent, const char *name, const TQStringList &) - : KDevBuildTool(&data, parent, name ? name : "ScriptProjectPart") +ScriptProjectPart::ScriptProjectPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevBuildTool(&data, tqparent, name ? name : "ScriptProjectPart") { setInstance(ScriptProjectFactory::instance()); @@ -119,7 +119,7 @@ void ScriptProjectPart::openProject(const TQString &dirName, const TQString &pro do { dir.setPath(s.pop()); kdDebug(9015) << "Examining: " << dir.path() << endl; - const QFileInfoList *dirEntries = dir.entryInfoList(); + const TQFileInfoList *dirEntries = dir.entryInfoList(); if ( dirEntries ) { TQPtrListIterator it(*dirEntries); @@ -340,7 +340,7 @@ void ScriptProjectPart::rescan() do { dir.setPath(s.pop()); kdDebug(9015) << "Examining: " << dir.path() << endl; - const QFileInfoList *dirEntries = dir.entryInfoList(); + const TQFileInfoList *dirEntries = dir.entryInfoList(); if ( dirEntries ) { TQPtrListIterator it(*dirEntries); @@ -370,7 +370,7 @@ void ScriptProjectPart::rescan() } } while (!s.isEmpty()); -/* const QFileInfoList *dirEntries = TQDir(path).entryInfoList(); +/* const TQFileInfoList *dirEntries = TQDir(path).entryInfoList(); if ( dirEntries ) { kdDebug() << "1" << endl; diff --git a/buildtools/script/scriptprojectpart.h b/buildtools/script/scriptprojectpart.h index b3a748ed..2029c09b 100644 --- a/buildtools/script/scriptprojectpart.h +++ b/buildtools/script/scriptprojectpart.h @@ -25,9 +25,10 @@ class ScriptProjectWidget; class ScriptProjectPart : public KDevBuildTool { Q_OBJECT + TQ_OBJECT public: - ScriptProjectPart( TQObject *parent, const char *name, const TQStringList &args ); + ScriptProjectPart( TQObject *tqparent, const char *name, const TQStringList &args ); ~ScriptProjectPart(); TQStringList distFiles() const; -- cgit v1.2.1