From e63beeb5bdb82987b1e00bc35178667786fbad48 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 5 Dec 2011 16:20:48 -0600 Subject: Fix incorrect conversion --- xparts/src/kde/kbrowsersignals.cpp | 6 +++--- xparts/src/kde/kbrowsersignals.h | 4 ++-- xparts/src/kde/xparthost_kpart.cpp | 30 +++++++++++++++--------------- xparts/src/kde/xparthost_kpart.h | 12 ++++++------ 4 files changed, 26 insertions(+), 26 deletions(-) (limited to 'xparts/src/kde') diff --git a/xparts/src/kde/kbrowsersignals.cpp b/xparts/src/kde/kbrowsersignals.cpp index 8daa1a54..18c58362 100644 --- a/xparts/src/kde/kbrowsersignals.cpp +++ b/xparts/src/kde/kbrowsersignals.cpp @@ -17,13 +17,13 @@ KBrowserSignals::~KBrowserSignals() delete ext; } -void KBrowserSignals::openURLRequest( const TTQCString &url) +void KBrowserSignals::openURLRequest( const TQCString &url) { - KURL u = TTQString(url); + KURL u = TQString(url); emit KParts::BrowserExtension::openURLRequest(u); } -void KBrowserSignals::createNewWindow( const TTQCString &url ) +void KBrowserSignals::createNewWindow( const TQCString &url ) { } diff --git a/xparts/src/kde/kbrowsersignals.h b/xparts/src/kde/kbrowsersignals.h index 6ef31433..3bd29a7f 100644 --- a/xparts/src/kde/kbrowsersignals.h +++ b/xparts/src/kde/kbrowsersignals.h @@ -16,8 +16,8 @@ public: virtual ~KBrowserSignals(); - virtual ASYNC openURLRequest( const TTQCString &url); - virtual ASYNC createNewWindow( const TTQCString &url ); + virtual ASYNC openURLRequest( const TQCString &url); + virtual ASYNC createNewWindow( const TQCString &url ); protected: XPartHost_KPart *part; diff --git a/xparts/src/kde/xparthost_kpart.cpp b/xparts/src/kde/xparthost_kpart.cpp index 0ad0e952..cd9ca39e 100644 --- a/xparts/src/kde/xparthost_kpart.cpp +++ b/xparts/src/kde/xparthost_kpart.cpp @@ -14,8 +14,8 @@ #include -XPartHost_KPart::XPartHost_KPart( TTQWidget *parentWidget, const char *widgetName, - TTQObject *parent, const char *name ) +XPartHost_KPart::XPartHost_KPart( TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name ) : KParts::ReadOnlyPart( parent, name ), XPartHost("parthost") { @@ -57,24 +57,24 @@ DCOPRef XPartHost_KPart::registerXPart( const DCOPRef &part ) } -void XPartHost_KPart::createActions( const TTQCString &xmlActions ) +void XPartHost_KPart::createActions( const TQCString &xmlActions ) { qDebug("--> createActions"); // creates a set of actions and adds them to the actionCollection - TTQDomDocument d; + TQDomDocument d; d.setContent( xmlActions ); - TTQDomElement docElem = d.documentElement(); + TQDomElement docElem = d.documentElement(); kdDebug() << "docElement is " << docElem.tagName() << endl; - TTQDomNode n = docElem.firstChild(); + TQDomNode n = docElem.firstChild(); while( !n.isNull() ) { - TTQDomElement e = n.toElement(); + TQDomElement e = n.toElement(); if( !e.isNull() ) { if ( e.tagName() == "Action") { - TTQString name = e.attribute("name"); - TTQString type = e.attribute("type"); + TQString name = e.attribute("name"); + TQString type = e.attribute("type"); if(type.isEmpty()) new KAction( name, 0, this, TQT_SLOT( actionActivated() ), actionCollection(), name.latin1() ); @@ -82,7 +82,7 @@ void XPartHost_KPart::createActions( const TTQCString &xmlActions ) new KToggleAction( name, 0, this, TQT_SLOT( actionActivated() ), actionCollection(), name.latin1() ); kdDebug() << "action=" << name << " type=" << type << endl; } else if ( e.tagName() == "XMLFile" ) { - TTQString location = e.attribute("location"); + TQString location = e.attribute("location"); setXMLFile(location); } } @@ -92,12 +92,12 @@ void XPartHost_KPart::createActions( const TTQCString &xmlActions ) } -void XPartHost_KPart::setWindowCaption( const TTQString &caption ) +void XPartHost_KPart::setWindowCaption( const TQString &caption ) { emit KParts::ReadOnlyPart::setWindowCaption( caption ); } -void XPartHost_KPart::setStatusBarText( const TTQString &text ) +void XPartHost_KPart::setStatusBarText( const TQString &text ) { emit KParts::ReadOnlyPart::setStatusBarText( text ); } @@ -112,7 +112,7 @@ void XPartHost_KPart::completed() emit KParts::ReadOnlyPart::completed(); } -void XPartHost_KPart::canceled( const TTQString &errMsg ) +void XPartHost_KPart::canceled( const TQString &errMsg ) { emit KParts::ReadOnlyPart::canceled( errMsg ); } @@ -131,12 +131,12 @@ bool XPartHost_KPart::closeURL() void XPartHost_KPart::actionActivated() { - const TTQObject *o = sender(); + const TQObject *o = sender(); if( !o->inherits("KAction") ) return; const KAction *action = static_cast(o); - TTQString name = action->text(); + TQString name = action->text(); int state = 0; if(action->inherits("KToggleAction")) { diff --git a/xparts/src/kde/xparthost_kpart.h b/xparts/src/kde/xparthost_kpart.h index 9428fc0a..0daf20f7 100644 --- a/xparts/src/kde/xparthost_kpart.h +++ b/xparts/src/kde/xparthost_kpart.h @@ -21,8 +21,8 @@ class XPartHost_KPart : public KParts::ReadOnlyPart, public XPartHost { Q_OBJECT public: - XPartHost_KPart( TTQWidget *parentWidget, const char *widgetName, - TTQObject *parent, const char *name ); + XPartHost_KPart( TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name ); virtual ~XPartHost_KPart(); // DCOP stuff @@ -36,18 +36,18 @@ public: // KPart signals /** Emitted by the XPart, to be transfered to the KPart host */ - virtual ASYNC createActions( const TTQCString &xmlActions ); + virtual ASYNC createActions( const TQCString &xmlActions ); /** Emitted by the XPart, to be transfered to the KPart host */ - virtual ASYNC setWindowCaption( const TTQString &caption ); + virtual ASYNC setWindowCaption( const TQString &caption ); /** Emitted by the XPart, to be transfered to the KPart host */ - virtual ASYNC setStatusBarText( const TTQString &text ); + virtual ASYNC setStatusBarText( const TQString &text ); /** Emitted by the XPart, to be transfered to the KPart host */ virtual ASYNC started(); /** Emitted by the XPart, to be transfered to the KPart host */ virtual ASYNC completed(); /** Emitted by the XPart, to be transfered to the KPart host */ - virtual ASYNC canceled( const TTQString &errMsg ); + virtual ASYNC canceled( const TQString &errMsg ); // reimplemented from KReadOnlyPart /** function called by the KPart host to be forwarded to the XPart */ -- cgit v1.2.1