From d7633c195a464e4d344ada9eea61afd10110598a Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 4 May 2011 19:54:24 +0000 Subject: Port kdesvn to TQt4 This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdesvn@1230412 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/kdesvn_part.cpp | 98 ++++++++++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 49 deletions(-) (limited to 'src/kdesvn_part.cpp') diff --git a/src/kdesvn_part.cpp b/src/kdesvn_part.cpp index 83cd0d0..3ee7b36 100644 --- a/src/kdesvn_part.cpp +++ b/src/kdesvn_part.cpp @@ -46,34 +46,34 @@ #include #include -#include -#include +#include +#include //K_EXPORT_COMPONENT_FACTORY( libkdesvnpart, kdesvnPartFactory ) extern "C" { KDESVN_EXPORT void *init_libkdesvnpart() { return new kdesvnPartFactory; } } static const char version[] = VERSION; -QString kdesvnPart::m_Extratext = ""; +TQString kdesvnPart::m_Extratext = ""; static const char description[] = I18N_NOOP("A Subversion Client for KDE (dynamic Part component)"); -kdesvnPart::kdesvnPart( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name , const QStringList&) - : KParts::ReadOnlyPart(parent, name) +kdesvnPart::kdesvnPart( TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name , const TQStringList&) + : KParts::ReadOnlyPart(tqparent, name) { - init(parentWidget,widgetName,false); + init(tqparentWidget,widgetName,false); } -kdesvnPart::kdesvnPart(QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name,bool ownapp, const QStringList&) - : KParts::ReadOnlyPart(parent, name) +kdesvnPart::kdesvnPart(TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name,bool ownapp, const TQStringList&) + : KParts::ReadOnlyPart(tqparent, name) { - init(parentWidget,widgetName,ownapp); + init(tqparentWidget,widgetName,ownapp); } -void kdesvnPart::init( QWidget *parentWidget, const char *widgetName,bool full) +void kdesvnPart::init( TQWidget *tqparentWidget, const char *widgetName,bool full) { m_aboutDlg = 0; KGlobal::locale()->insertCatalogue("kdesvn"); @@ -82,7 +82,7 @@ void kdesvnPart::init( QWidget *parentWidget, const char *widgetName,bool full) m_browserExt = new KdesvnBrowserExtension( this ); // this should be your custom internal widget - m_view = new kdesvnView(actionCollection(),parentWidget,widgetName,full); + m_view = new kdesvnView(actionCollection(),tqparentWidget,widgetName,full); // notify the part that this is our internal widget setWidget(m_view); @@ -96,12 +96,12 @@ void kdesvnPart::init( QWidget *parentWidget, const char *widgetName,bool full) #else setXMLFile("kdesvn_part.rc"); #endif - connect(m_view,SIGNAL(sigShowPopup(const QString&,QWidget**)),this,SLOT(slotDispPopup(const QString&,QWidget**))); - connect(m_view,SIGNAL(sigSwitchUrl(const KURL&)),this,SLOT(openURL(const KURL&))); - connect(this,SIGNAL(refreshTree()),m_view,SLOT(refreshCurrentTree())); - connect(m_view,SIGNAL(setWindowCaption(const QString&)),this,SIGNAL(setWindowCaption(const QString&))); - connect(m_view,SIGNAL(sigUrlChanged( const QString&)),this,SLOT(slotUrlChanged(const QString&))); - connect(this,SIGNAL(settingsChanged()),widget(),SLOT(slotSettingsChanged())); + connect(m_view,TQT_SIGNAL(sigShowPopup(const TQString&,TQWidget**)),this,TQT_SLOT(slotDispPopup(const TQString&,TQWidget**))); + connect(m_view,TQT_SIGNAL(sigSwitchUrl(const KURL&)),this,TQT_SLOT(openURL(const KURL&))); + connect(this,TQT_SIGNAL(refreshTree()),m_view,TQT_SLOT(refreshCurrentTree())); + connect(m_view,TQT_SIGNAL(setWindowCaption(const TQString&)),this,TQT_SIGNAL(setWindowCaption(const TQString&))); + connect(m_view,TQT_SIGNAL(sigUrlChanged( const TQString&)),this,TQT_SLOT(slotUrlChanged(const TQString&))); + connect(this,TQT_SIGNAL(settingsChanged()),widget(),TQT_SLOT(slotSettingsChanged())); m_browserExt->setPropertiesActionEnabled(false); } @@ -111,7 +111,7 @@ kdesvnPart::~kdesvnPart() kdesvnPartFactory::instance()->config()->sync(); } -void kdesvnPart::slotUrlChanged(const QString&url) +void kdesvnPart::slotUrlChanged(const TQString&url) { m_url = url; } @@ -149,15 +149,15 @@ void kdesvnPart::slotFileProperties() { } -void kdesvnPart::slotDispPopup(const QString&name,QWidget**target) +void kdesvnPart::slotDispPopup(const TQString&name,TQWidget**target) { *target = hostContainer(name); } KAboutData* kdesvnPart::createAboutData() { - m_Extratext = QString(I18N_NOOP("Built with Subversion library: %1\n")).arg(svn::Version::linked_version()); - m_Extratext+=QString(I18N_NOOP("Running Subversion library: %1")).arg(svn::Version::running_version()); + m_Extratext = TQString(I18N_NOOP("Built with Subversion library: %1\n")).tqarg(svn::Version::linked_version()); + m_Extratext+=TQString(I18N_NOOP("Running Subversion library: %1")).tqarg(svn::Version::running_version()); KAboutData*about = new KAboutData("kdesvnpart", I18N_NOOP("kdesvn Part"), version, description, KAboutData::License_GPL, "(C) 2005-2007 Rajko Albrecht",0, @@ -182,37 +182,37 @@ void kdesvnPart::setupActions() toggletemp = new KToggleAction(i18n("Logs follow node changes"),KShortcut(), actionCollection(),"toggle_log_follows"); toggletemp->setChecked(Kdesvnsettings::log_follows_nodes()); - connect(toggletemp,SIGNAL(toggled(bool)),this,SLOT(slotLogFollowNodes(bool))); + connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotLogFollowNodes(bool))); toggletemp = new KToggleAction(i18n("Display ignored files"),KShortcut(), actionCollection(),"toggle_ignored_files"); toggletemp->setChecked(Kdesvnsettings::display_ignored_files()); - connect(toggletemp,SIGNAL(toggled(bool)),this,SLOT(slotDisplayIgnored(bool))); + connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotDisplayIgnored(bool))); toggletemp = new KToggleAction(i18n("Display unknown files"),KShortcut(), actionCollection(),"toggle_unknown_files"); toggletemp->setChecked(Kdesvnsettings::display_unknown_files()); - connect(toggletemp,SIGNAL(toggled(bool)),this,SLOT(slotDisplayUnkown(bool))); + connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotDisplayUnkown(bool))); toggletemp = new KToggleAction(i18n("Hide unchanged files"),KShortcut(), actionCollection(),"toggle_hide_unchanged_files"); toggletemp->setChecked(Kdesvnsettings::hide_unchanged_files()); - connect(toggletemp,SIGNAL(toggled(bool)),this,SLOT(slotHideUnchanged(bool))); + connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotHideUnchanged(bool))); toggletemp = new KToggleAction(i18n("Work online"),KShortcut(), actionCollection(),"toggle_network"); toggletemp->setChecked(Kdesvnsettings::network_on()); - connect(toggletemp,SIGNAL(toggled(bool)),this,SLOT(slotEnableNetwork(bool))); + connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotEnableNetwork(bool))); - kdDebug()<<"Appname = " << (QString)kapp->instanceName() << endl; + kdDebug()<<"Appname = " << (TQString)kapp->instanceName() << endl; - KAction * t = KStdAction::preferences(this, SLOT(slotShowSettings()), actionCollection(),"kdesvnpart_pref"); - t->setText(i18n("&Configure %1...").arg("Kdesvn")); - if (QString(kapp->instanceName())!=QString("kdesvn")) { - (void)new KAction(i18n("&About kdesvn part"), "kdesvn", 0, this, SLOT(showAboutApplication()), actionCollection(), "help_about_kdesvnpart"); - (void)new KAction(i18n("Kdesvn &Handbook"), "help", 0, this, SLOT(appHelpActivated()), actionCollection(), "help_kdesvn"); - (void)new KAction(i18n("Send Bugreport for kdesvn"), 0, 0, this, SLOT(reportBug()), actionCollection(), "report_bug"); + KAction * t = KStdAction::preferences(this, TQT_SLOT(slotShowSettings()), actionCollection(),"kdesvnpart_pref"); + t->setText(i18n("&Configure %1...").tqarg("Kdesvn")); + if (TQString(kapp->instanceName())!=TQString("kdesvn")) { + (void)new KAction(i18n("&About kdesvn part"), "kdesvn", 0, this, TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_kdesvnpart"); + (void)new KAction(i18n("Kdesvn &Handbook"), "help", 0, this, TQT_SLOT(appHelpActivated()), actionCollection(), "help_kdesvn"); + (void)new KAction(i18n("Send Bugreport for kdesvn"), 0, 0, this, TQT_SLOT(reportBug()), actionCollection(), "report_bug"); } actionCollection()->setHighlightingEnabled(true); } @@ -302,7 +302,7 @@ void KdesvnBrowserExtension::setPropertiesActionEnabled(bool enabled) void KdesvnBrowserExtension::properties() { - static_cast(parent())->slotFileProperties(); + static_cast(tqparent())->slotFileProperties(); } @@ -320,7 +320,7 @@ void kdesvnPart::reportBug() */ void kdesvnPart::showAboutApplication() { - if (!m_aboutDlg) m_aboutDlg = new KAboutApplication(createAboutData(), (QWidget *)0, (const char *)0, false); + if (!m_aboutDlg) m_aboutDlg = new KAboutApplication(createAboutData(), (TQWidget *)0, (const char *)0, false); if(m_aboutDlg == 0) return; if(!m_aboutDlg->isVisible()) @@ -335,7 +335,7 @@ void kdesvnPart::showAboutApplication() */ void kdesvnPart::appHelpActivated() { - kapp->invokeHelp(QString::null, "kdesvn"); + kapp->invokeHelp(TQString(), "kdesvn"); } @@ -365,7 +365,7 @@ void kdesvnPart::slotShowSettings() dialog->addPage(new CmdExecSettings_impl(0,"cmdexec_items"), "KIO/"+i18n("Commandline"),"terminal",i18n("Settings for commandline and KIO execution"),true); - connect(dialog,SIGNAL(settingsChanged()),this,SLOT(slotSettingsChanged())); + connect(dialog,TQT_SIGNAL(settingsChanged()),this,TQT_SLOT(slotSettingsChanged())); dialog->show(); } @@ -400,22 +400,22 @@ KInstance* cFactory::s_instance = 0L; KAboutData* cFactory::s_about = 0L; commandline_part* cFactory::s_cline = 0L; -KParts::Part* cFactory::createPartObject( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, - const char *classname, const QStringList &args ) +KParts::Part* cFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, + const char *classname, const TQStringList &args ) { Q_UNUSED(classname); // Create an instance of our Part - return new kdesvnPart( parentWidget, widgetName, parent, name, args ); + return new kdesvnPart( tqparentWidget, widgetName, tqparent, name, args ); } -KParts::Part* cFactory::createAppPart( QWidget *parentWidget, const char *widgetName, - QObject *parent, const char *name, - const char *classname, const QStringList &args ) +KParts::Part* cFactory::createAppPart( TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, + const char *classname, const TQStringList &args ) { Q_UNUSED(classname); // Create an instance of our Part - kdesvnPart* obj = new kdesvnPart( parentWidget, widgetName, parent, name, false, args); + kdesvnPart* obj = new kdesvnPart( tqparentWidget, widgetName, tqparent, name, false, args); emit objectCreated( obj ); return obj; } @@ -439,11 +439,11 @@ KInstance* cFactory::instance() return s_instance; } -commandline_part*cFactory::createCommandIf(QObject*parent,const char*name, KCmdLineArgs *args) +commandline_part*cFactory::createCommandIf(TQObject*tqparent,const char*name, KCmdLineArgs *args) { if (!s_cline) { // no emit of creation - we will delete this object in destructor - s_cline = new commandline_part(parent,name,args); + s_cline = new commandline_part(tqparent,name,args); } return s_cline; } -- cgit v1.2.1