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 --- vcs/subversion/subversion_part.cpp | 40 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'vcs/subversion/subversion_part.cpp') diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp index af58f7c8..d9869854 100644 --- a/vcs/subversion/subversion_part.cpp +++ b/vcs/subversion/subversion_part.cpp @@ -63,8 +63,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevsubversion, subversionFactory( data ) ) //bool g_projectWasJustCreated = false; -subversionPart::subversionPart(TQObject *parent, const char *name, const TQStringList& ) - : KDevVersionControl(&data, parent, name ? name : "Subversion" ) { +subversionPart::subversionPart(TQObject *tqparent, const char *name, const TQStringList& ) + : KDevVersionControl(&data, tqparent, name ? name : "Subversion" ) { setInstance(subversionFactory::instance()); m_projWidget = 0; @@ -159,9 +159,9 @@ void subversionPart::setupActions() { this, TQT_SLOT(slotMerge()), actionCollection(), "subversion_merge" ); } -TQWidget* subversionPart::newProjectWidget( TQWidget* parent ) { +TQWidget* subversionPart::newProjectWidget( TQWidget* tqparent ) { if ( !m_projWidget ) - m_projWidget = new subversionProjectWidget(parent,"projectwidget"); + m_projWidget = new subversionProjectWidget(tqparent,"projectwidget"); return m_projWidget; } @@ -220,44 +220,44 @@ if(!project()) subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) ); subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) ); }*/ - subMenu->setWhatsThis(id, i18n("Commit file(s)

Commits file to repository if modified.")); + subMenu->tqsetWhatsThis(id, i18n("Commit file(s)

Commits file to repository if modified.")); id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) ); - subMenu->setWhatsThis(id, i18n("Add file to repository

Adds file to repository.")); + subMenu->tqsetWhatsThis(id, i18n("Add file to repository

Adds file to repository.")); id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotDel()) ); - subMenu->setWhatsThis(id, i18n("Remove from repository

Removes file(s) from repository.")); + subMenu->tqsetWhatsThis(id, i18n("Remove from repository

Removes file(s) from repository.")); id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) ); - subMenu->setWhatsThis(id, i18n("Show logs..

View Logs")); + subMenu->tqsetWhatsThis(id, i18n("Show logs..

View Logs")); id = subMenu->insertItem( actionBlame->text(), this, TQT_SLOT(slotBlame()) ); - subMenu->setWhatsThis(id, i18n("Blame 0:HEAD

Show Annotate")); + subMenu->tqsetWhatsThis(id, i18n("Blame 0:HEAD

Show Annotate")); subMenu->insertSeparator(); id = subMenu->insertItem( actionDiffLocal->text(), this, TQT_SLOT(slotDiffLocal()) ); - subMenu->setWhatsThis(id, i18n("Diff

Diff file to local disk.")); + subMenu->tqsetWhatsThis(id, i18n("Diff

Diff file to local disk.")); id = subMenu->insertItem( actionDiffHead->text(), this, TQT_SLOT(slotDiffHead()) ); - subMenu->setWhatsThis(id, i18n("Diff

Diff file to repository.")); + subMenu->tqsetWhatsThis(id, i18n("Diff

Diff file to repository.")); id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) ); - subMenu->setWhatsThis(id, i18n("Update

Updates file(s) from repository.")); + subMenu->tqsetWhatsThis(id, i18n("Update

Updates file(s) from repository.")); id = subMenu->insertItem( actionRevert->text(), this, TQT_SLOT(slotRevert()) ); - subMenu->setWhatsThis(id, i18n("Revert

Undo local changes.") ); + subMenu->tqsetWhatsThis(id, i18n("Revert

Undo local changes.") ); id = subMenu->insertItem( actionResolve->text(), this, TQT_SLOT(slotResolve()) ); - subMenu->setWhatsThis(id, i18n("Resolve

Resolve conflicting state.") ); + subMenu->tqsetWhatsThis(id, i18n("Resolve

Resolve conflicting state.") ); id = subMenu->insertItem( actionSwitch->text(), this, TQT_SLOT(slotSwitch()) ); - subMenu->setWhatsThis(id, i18n("Switch

Switch working tree.") ); + subMenu->tqsetWhatsThis(id, i18n("Switch

Switch working tree.") ); id = subMenu->insertItem( actionCopy->text(), this, TQT_SLOT(slotCopy()) ); - subMenu->setWhatsThis(id, i18n("Copy

Copy from/between path/URLs") ); + subMenu->tqsetWhatsThis(id, i18n("Copy

Copy from/between path/URLs") ); id = subMenu->insertItem( actionMerge->text(), this, TQT_SLOT(slotMerge()) ); - subMenu->setWhatsThis(id, i18n("Merge

Merge difference to working copy") ); + subMenu->tqsetWhatsThis(id, i18n("Merge

Merge difference to working copy") ); /* subMenu->insertSeparator(); id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) ); - subMenu->setWhatsThis(id, i18n("Ignore in Subversion operations

Ignores file(s).")); + subMenu->tqsetWhatsThis(id, i18n("Ignore in Subversion operations

Ignores file(s).")); id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) ); - subMenu->setWhatsThis(id, i18n("Do not ignore in Subversion operations

Do not ignore file(s).")); + subMenu->tqsetWhatsThis(id, i18n("Do not ignore in Subversion operations

Do not ignore file(s).")); */ - // Now insert in parent menu + // Now insert in tqparent menu popup->insertItem( i18n("Subversion"), subMenu ); } } -- cgit v1.2.1