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 --- languages/csharp/README.dox | 2 +- languages/csharp/csharpconfigwidget.cpp | 4 ++-- languages/csharp/csharpconfigwidget.h | 3 ++- languages/csharp/csharpconfigwidgetbase.ui | 12 ++++++------ languages/csharp/csharpsupportpart.cpp | 8 ++++---- languages/csharp/csharpsupportpart.h | 3 ++- 6 files changed, 17 insertions(+), 15 deletions(-) (limited to 'languages/csharp') diff --git a/languages/csharp/README.dox b/languages/csharp/README.dox index 6d256b08..36797a75 100644 --- a/languages/csharp/README.dox +++ b/languages/csharp/README.dox @@ -12,7 +12,7 @@ and images. \maintainer Luc Willems \feature csharp programming language support -\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part. +\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part. \bug Describe a the 1st bug that you know of, but probably hasn't been reported yet. .. diff --git a/languages/csharp/csharpconfigwidget.cpp b/languages/csharp/csharpconfigwidget.cpp index 620f7881..dea62747 100644 --- a/languages/csharp/csharpconfigwidget.cpp +++ b/languages/csharp/csharpconfigwidget.cpp @@ -17,8 +17,8 @@ CSharpConfigWidget::CSharpConfigWidget(TQDomDocument &projectDom, - TQWidget *parent, const char *name) - : CSharpConfigWidgetBase(parent, name), dom(projectDom) + TQWidget *tqparent, const char *name) + : CSharpConfigWidgetBase(tqparent, name), dom(projectDom) { interpreter_edit->setText(DomUtil::readEntry(dom, "/kdevcsharpsupport/run/interpreter")); terminal_box->setChecked(DomUtil::readBoolEntry(dom, "/kdevcsharpsupport/run/terminal")); diff --git a/languages/csharp/csharpconfigwidget.h b/languages/csharp/csharpconfigwidget.h index a44570cd..25b6e58f 100644 --- a/languages/csharp/csharpconfigwidget.h +++ b/languages/csharp/csharpconfigwidget.h @@ -19,9 +19,10 @@ class CSharpConfigWidget : public CSharpConfigWidgetBase { Q_OBJECT + TQ_OBJECT public: - CSharpConfigWidget( TQDomDocument &projectDom, TQWidget *parent=0, const char *name=0 ); + CSharpConfigWidget( TQDomDocument &projectDom, TQWidget *tqparent=0, const char *name=0 ); ~CSharpConfigWidget(); public slots: diff --git a/languages/csharp/csharpconfigwidgetbase.ui b/languages/csharp/csharpconfigwidgetbase.ui index dbf4d3ae..1b7dd060 100644 --- a/languages/csharp/csharpconfigwidgetbase.ui +++ b/languages/csharp/csharpconfigwidgetbase.ui @@ -1,6 +1,6 @@ CSharpConfigWidgetBase - + csharp_config_widget @@ -20,7 +20,7 @@ unnamed - + interpreter_label @@ -31,7 +31,7 @@ interpreter_edit - + Layout1 @@ -72,7 +72,7 @@ Minimum - + terminal_box @@ -96,6 +96,6 @@ kdialog.h - - + + diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp index d0bc9be6..0c67b155 100644 --- a/languages/csharp/csharpsupportpart.cpp +++ b/languages/csharp/csharpsupportpart.cpp @@ -48,8 +48,8 @@ typedef KDevGenericFactory CSharpSupportFactory; static const KDevPluginInfo data("kdevcsharpsupport"); K_EXPORT_COMPONENT_FACTORY( libkdevcsharpsupport, CSharpSupportFactory( data ) ) -CSharpSupportPart::CSharpSupportPart(TQObject *parent, const char *name, const TQStringList &) - : KDevLanguageSupport(&data, parent, name ? name : "CSharpSupportPart") +CSharpSupportPart::CSharpSupportPart(TQObject *tqparent, const char *name, const TQStringList &) + : KDevLanguageSupport(&data, tqparent, name ? name : "CSharpSupportPart") { setInstance(CSharpSupportFactory::instance()); @@ -166,7 +166,7 @@ void CSharpSupportPart::savedFile(const KURL &fileName) #if 0 // not needed anymore kdDebug(9016) << "savedFile()" << endl; - if (project()->allFiles().contains(fileName.mid ( project()->projectDirectory().length() + 1 ))) { + if (project()->allFiles().tqcontains(fileName.mid ( project()->projectDirectory().length() + 1 ))) { maybeParse(fileName); emit updatedSourceInfo(); } @@ -215,7 +215,7 @@ void CSharpSupportPart::slotStartInterpreter() void CSharpSupportPart::slotExecuteString() { bool ok; - TQString cmd = KInputDialog::getText(i18n("String to Execute"), i18n("String to execute:"), TQString::null, &ok, 0); + TQString cmd = KInputDialog::getText(i18n("String to Execute"), i18n("String to execute:"), TQString(), &ok, 0); if (ok) { cmd.prepend("'"); cmd.append("'"); diff --git a/languages/csharp/csharpsupportpart.h b/languages/csharp/csharpsupportpart.h index 35d2b7ba..df2390c8 100644 --- a/languages/csharp/csharpsupportpart.h +++ b/languages/csharp/csharpsupportpart.h @@ -19,9 +19,10 @@ class CSharpSupportPart : public KDevLanguageSupport { Q_OBJECT + TQ_OBJECT public: - CSharpSupportPart( TQObject *parent, const char *name, const TQStringList & ); + CSharpSupportPart( TQObject *tqparent, const char *name, const TQStringList & ); ~CSharpSupportPart(); protected: -- cgit v1.2.3