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/ruby/rubysupport_part.cpp | 48 ++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'languages/ruby/rubysupport_part.cpp') diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp index 411f06ff..4fe000a5 100644 --- a/languages/ruby/rubysupport_part.cpp +++ b/languages/ruby/rubysupport_part.cpp @@ -41,8 +41,8 @@ typedef KDevGenericFactory RubySupportFactory; static const KDevPluginInfo data("kdevrubysupport"); K_EXPORT_COMPONENT_FACTORY( libkdevrubysupport, RubySupportFactory( data ) ) -RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStringList& ) - : KDevLanguageSupport (&data, parent, name ? name : "RubySupportPart" ) +RubySupportPart::RubySupportPart(TQObject *tqparent, const char *name, const TQStringList& ) + : KDevLanguageSupport (&data, tqparent, name ? name : "RubySupportPart" ) { setInstance(RubySupportFactory::instance()); setXMLFile("kdevrubysupport.rc"); @@ -205,7 +205,7 @@ void RubySupportPart::savedFile(const KURL &fileName) { kdDebug() << "savedFile()" << endl; - if (project()->allFiles().contains(fileName.path().mid ( project()->projectDirectory().length() + 1 ))) { + if (project()->allFiles().tqcontains(fileName.path().mid ( project()->projectDirectory().length() + 1 ))) { maybeParse(fileName.path()); emit addedSourceInfo( fileName.path() ); } @@ -261,11 +261,11 @@ void RubySupportPart::parse(const TQString &fileName) m_file->addClass( lastClass ); } - TQString parent = classre.cap(5); - if (!parent.isEmpty()) + TQString tqparent = classre.cap(5); + if (!tqparent.isEmpty()) { - kdDebug() << "Add parent " << parent << endl; - lastClass->addBaseClass( parent ); + kdDebug() << "Add tqparent " << tqparent << endl; + lastClass->addBaseClass( tqparent ); } lastAccess = CodeModelItem::Public; @@ -532,12 +532,12 @@ void RubySupportPart::slotRun () appFrontend->startAppCommand(project()->projectDirectory(), cmd, false); } else { TQString cmd = TQString("%1 -K%2 -C\"%3\" -I\"%4\" \"%5\" %6") - .arg(interpreter()) - .arg(characterCoding()) - .arg(runDirectory()) - .arg(program.dirPath()) - .arg(program.fileName()) - .arg(programArgs()); + .tqarg(interpreter()) + .tqarg(characterCoding()) + .tqarg(runDirectory()) + .tqarg(program.dirPath()) + .tqarg(program.fileName()) + .tqarg(programArgs()); startApplication(cmd); } } @@ -632,12 +632,12 @@ KDevDesignerIntegration *RubySupportPart::designer(KInterfaceDesigner::DesignerT KDevDesignerIntegration *des = 0; switch (type) { - case KInterfaceDesigner::QtDesigner: + case KInterfaceDesigner::TQtDesigner: des = m_designers[type]; if (des == 0) { RubyImplementationWidget *impl = new RubyImplementationWidget(this); - des = new QtDesignerRubyIntegration(this, impl); + des = new TQtDesignerRubyIntegration(this, impl); des->loadSettings(*project()->projectDom(), "kdevrubysupport/designerintegration"); m_designers[type] = des; @@ -669,7 +669,7 @@ void RubySupportPart::contextMenu( TQPopupMenu * popup, const Context * context { m_contextFileName = url.fileName(); int id = popup->insertItem(i18n("Create or Select Implementation..."), this, TQT_SLOT(slotCreateSubclass())); - popup->setWhatsThis(id, i18n("Create or select implementation

Creates or selects a subclass of selected form for use with integrated KDevDesigner.")); + popup->tqsetWhatsThis(id, i18n("Create or select implementation

Creates or selects a subclass of selected form for use with integrated KDevDesigner.")); } } } @@ -679,7 +679,7 @@ void RubySupportPart::slotCreateSubclass() TQFileInfo fi(m_contextFileName); if (fi.extension(false) != "ui") return; - QtDesignerRubyIntegration *des = dynamic_cast(designer(KInterfaceDesigner::QtDesigner)); + TQtDesignerRubyIntegration *des = dynamic_cast(designer(KInterfaceDesigner::TQtDesigner)); if (des) des->selectImplementation(m_contextFileName); } @@ -715,7 +715,7 @@ void RubySupportPart::slotSwitchToController() } else if (ext == "rjs" || ext == "rxml" || ext == "rhtml" || ext == "js.rjs" || ext == "xml.builder" || ext == "html.erb") { - //this is a view, we need to find the directory of this view and try to find + //this is a view, we need to find the directory of this view and try to tqfind //the controller basing on the directory information switchTo = file.dir().dirName(); } @@ -896,12 +896,12 @@ void RubySupportPart::slotRunTestUnderCursor() TQFileInfo program(prog); TQString cmd = TQString("%1 -K%2 -C\"%3\" -I\"%4\" \"%5\" %6") - .arg(interpreter()) - .arg(characterCoding()) - .arg(runDirectory()) - .arg(program.dirPath()) - .arg(program.fileName()) - .arg(" -n " + fun->name()); + .tqarg(interpreter()) + .tqarg(characterCoding()) + .tqarg(runDirectory()) + .tqarg(program.dirPath()) + .tqarg(program.fileName()) + .tqarg(" -n " + fun->name()); startApplication(cmd); } -- cgit v1.2.1