diff options
Diffstat (limited to 'xparts/src')
-rw-r--r-- | xparts/src/gtk/gtkbrowserextension.c | 10 | ||||
-rw-r--r-- | xparts/src/gtk/gtkpart.c | 12 | ||||
-rw-r--r-- | xparts/src/interfaces/xbrowserextension.h | 4 | ||||
-rw-r--r-- | xparts/src/interfaces/xbrowsersignals.h | 4 | ||||
-rw-r--r-- | xparts/src/interfaces/xpart.h | 6 | ||||
-rw-r--r-- | xparts/src/interfaces/xparthost.h | 10 | ||||
-rw-r--r-- | xparts/src/interfaces/xpartmanager.h | 2 | ||||
-rw-r--r-- | xparts/src/kde/kbrowsersignals.cpp | 6 | ||||
-rw-r--r-- | xparts/src/kde/kbrowsersignals.h | 4 | ||||
-rw-r--r-- | xparts/src/kde/xparthost_kpart.cpp | 30 | ||||
-rw-r--r-- | xparts/src/kde/xparthost_kpart.h | 12 |
11 files changed, 50 insertions, 50 deletions
diff --git a/xparts/src/gtk/gtkbrowserextension.c b/xparts/src/gtk/gtkbrowserextension.c index 36dc374c..5885f5c7 100644 --- a/xparts/src/gtk/gtkbrowserextension.c +++ b/xparts/src/gtk/gtkbrowserextension.c @@ -133,7 +133,7 @@ gboolean gtk_xbrowserextension_dcop_process( DcopObject *obj, const char *fun, d } return True; } - else if ( strcmp( fun, "restoreState(TTQByteArray)" ) == 0 ) + else if ( strcmp( fun, "restoreState(TQByteArray)" ) == 0 ) { if( klass->restore_state ) { size_t len; @@ -157,7 +157,7 @@ GList *gtk_xbrowserextension_dcop_functions( DcopObject *obj ) { GList *res = parent_class->functions( obj ); res = g_list_append( res, g_strdup( "saveState()" ) ); - res = g_list_append( res, g_strdup( "restoreState(TTQByteArray)" ) ); + res = g_list_append( res, g_strdup( "restoreState(TQByteArray)" ) ); return res; } @@ -235,7 +235,7 @@ gboolean gtk_browserextension_open_url_request( GtkXBrowserExtension *part, cons dcop_marshal_string( data, url ); - if ( !dcop_client_call( P->client, P->host_app_id, P->host_obj_id, "openURLRequest(TTQCString)", data, + if ( !dcop_client_call( P->client, P->host_app_id, P->host_obj_id, "openURLRequest(TQCString)", data, &reply_type, &reply_data ) ) { g_warning(" openURLRequest failed"); return FALSE; @@ -254,7 +254,7 @@ gboolean gtk_browserextension_set_status_bar_text( GtkXBrowserExtension *part, c dcop_marshal_string16( data, info ); - if ( !dcop_client_call( P->client, P->host_app_id, "parthost", "setStatusBarText(TTQString)", data, + if ( !dcop_client_call( P->client, P->host_app_id, "parthost", "setStatusBarText(TQString)", data, &reply_type, &reply_data ) ) { g_warning(" setStatusBarText failed"); return FALSE; @@ -273,7 +273,7 @@ gboolean gtk_browserextension_set_window_caption( GtkXBrowserExtension *part, co dcop_marshal_string16( data, info ); - if ( !dcop_client_call( P->client, P->host_app_id, "parthost", "setWindowCaption(TTQString)", data, + if ( !dcop_client_call( P->client, P->host_app_id, "parthost", "setWindowCaption(TQString)", data, &reply_type, &reply_data ) ) { g_warning(" setWindowCaption failed"); return FALSE; diff --git a/xparts/src/gtk/gtkpart.c b/xparts/src/gtk/gtkpart.c index 27040832..2a214123 100644 --- a/xparts/src/gtk/gtkpart.c +++ b/xparts/src/gtk/gtkpart.c @@ -150,7 +150,7 @@ gboolean gtk_xpart_dcop_process( DcopObject *obj, const char *fun, dcop_data *da gtk_widget_show_all( d->widget ); return True; } - else if ( strcmp( fun, "openURL(TTQCString)" ) == 0 ) + else if ( strcmp( fun, "openURL(TQCString)" ) == 0 ) { char *url; fprintf( stderr, "openURL!\n" ); @@ -174,7 +174,7 @@ gboolean gtk_xpart_dcop_process( DcopObject *obj, const char *fun, dcop_data *da dcop_marshal_boolean( *reply_data, b ); return True; } - else if ( strcmp( fun, "activateAction(TTQCString,int)" ) == 0 ) + else if ( strcmp( fun, "activateAction(TQCString,int)" ) == 0 ) { char *name; uint state; @@ -184,7 +184,7 @@ gboolean gtk_xpart_dcop_process( DcopObject *obj, const char *fun, dcop_data *da gtk_signal_emit_by_name( GTK_OBJECT(part), name, state); return True; } - else if ( strcmp( fun, "queryExtension(TTQCString)" ) == 0 ) { + else if ( strcmp( fun, "queryExtension(TQCString)" ) == 0 ) { char *name; char *extension = NULL; dcop_demarshal_string( data, &name ); @@ -205,9 +205,9 @@ GList *gtk_xpart_dcop_functions( DcopObject *obj ) GList *res = parent_class->functions( obj ); res = g_list_append( res, g_strdup( "windowId()" ) ); res = g_list_append( res, g_strdup( "show()" ) ); - res = g_list_append( res, g_strdup( "bool openURL(TTQString url)" ) ); + res = g_list_append( res, g_strdup( "bool openURL(TQString url)" ) ); res = g_list_append( res, g_strdup( "bool closeURL()" ) ); - res = g_list_append( res, g_strdup( "queryExtension(TTQCString)" ) ); + res = g_list_append( res, g_strdup( "queryExtension(TQCString)" ) ); return res; } @@ -289,7 +289,7 @@ gboolean gtk_xpart_initialize_actions( GtkXPart *part, const char * actions ) data = dcop_data_ref( dcop_data_new() ); dcop_marshal_string( data, actions ); - if( !dcop_client_send( d->client, d->host_app_id, d->host_obj_id, "createActions(TTQCString)", data ) ) { + if( !dcop_client_send( d->client, d->host_app_id, d->host_obj_id, "createActions(TQCString)", data ) ) { fprintf( stderr, "could not create actions\n" ); dcop_data_deref( data ); return FALSE; diff --git a/xparts/src/interfaces/xbrowserextension.h b/xparts/src/interfaces/xbrowserextension.h index b4be1224..b097ab65 100644 --- a/xparts/src/interfaces/xbrowserextension.h +++ b/xparts/src/interfaces/xbrowserextension.h @@ -10,8 +10,8 @@ class XBrowserExtension : public DCOPObject k_dcop: virtual void setBrowserSignals( const DCOPRef &ref) = 0; - virtual TTQByteArray saveState() = 0; - virtual void restoreState( TTQByteArray state ) = 0; + virtual TQByteArray saveState() = 0; + virtual void restoreState( TQByteArray state ) = 0; }; #endif diff --git a/xparts/src/interfaces/xbrowsersignals.h b/xparts/src/interfaces/xbrowsersignals.h index 9b6704ab..a4869e02 100644 --- a/xparts/src/interfaces/xbrowsersignals.h +++ b/xparts/src/interfaces/xbrowsersignals.h @@ -8,8 +8,8 @@ class XBrowserSignals : public DCOPObject K_DCOP k_dcop: - virtual ASYNC openURLRequest( const TTQCString &url) = 0; - virtual ASYNC createNewWindow( const TTQCString &url ) = 0; + virtual ASYNC openURLRequest( const TQCString &url) = 0; + virtual ASYNC createNewWindow( const TQCString &url ) = 0; }; #endif diff --git a/xparts/src/interfaces/xpart.h b/xparts/src/interfaces/xpart.h index 8b2e3a3c..1d323a5d 100644 --- a/xparts/src/interfaces/xpart.h +++ b/xparts/src/interfaces/xpart.h @@ -17,7 +17,7 @@ k_dcop: virtual void show() = 0; /** sent by the XPartHost to request url opening */ - virtual bool openURL( const TTQCString& url ) = 0; + virtual bool openURL( const TQCString& url ) = 0; /** sent by the XPartHost to close the url */ virtual bool closeURL() = 0; @@ -26,10 +26,10 @@ k_dcop: * XPartHost::createActions()) has been activated. Name is the name of the * action, state is used with Toggle actions to precise the current state. */ - virtual ASYNC activateAction( const TTQString &name, int state ) = 0; + virtual ASYNC activateAction( const TQString &name, int state ) = 0; /** Are extentions available -> browser extension / TextEditor ? */ - virtual DCOPRef queryExtension( const TTQCString& extension ) = 0; + virtual DCOPRef queryExtension( const TQCString& extension ) = 0; }; diff --git a/xparts/src/interfaces/xparthost.h b/xparts/src/interfaces/xparthost.h index 3cbede0f..75c6f4e0 100644 --- a/xparts/src/interfaces/xparthost.h +++ b/xparts/src/interfaces/xparthost.h @@ -8,7 +8,7 @@ class XPartHost : public DCOPObject { K_DCOP public: - XPartHost(TTQCString name) : DCOPObject(name) {} + XPartHost(TQCString name) : DCOPObject(name) {} k_dcop: @@ -20,17 +20,17 @@ k_dcop: /** The XPart informs its host about its available actions. * the actions are sent to the XPart using XPart::activateAction */ - virtual ASYNC createActions( const TTQCString &xmlActions ) = 0; + virtual ASYNC createActions( const TQCString &xmlActions ) = 0; /** DCOP signal emitted by the XPart and received here, to be * forwarded to the KPartHost. See KParts documentation for * more details. */ - virtual ASYNC setWindowCaption( const TTQString &caption ) = 0; + virtual ASYNC setWindowCaption( const TQString &caption ) = 0; /** DCOP signal emitted by the XPart and received here, to be * forwarded to the KPartHost. See KParts documentation for * more details. */ - virtual ASYNC setStatusBarText( const TTQString &text ) = 0; + virtual ASYNC setStatusBarText( const TQString &text ) = 0; /** DCOP signal emitted by the XPart and received here, to be @@ -46,7 +46,7 @@ k_dcop: /** DCOP signal emitted by the XPart and received here, to be * forwarded to the KPartHost. See KParts documentation for * more details. */ - virtual ASYNC canceled( const TTQString &errMsg ) = 0; + virtual ASYNC canceled( const TQString &errMsg ) = 0; }; diff --git a/xparts/src/interfaces/xpartmanager.h b/xparts/src/interfaces/xpartmanager.h index 7838fff1..25a341f8 100644 --- a/xparts/src/interfaces/xpartmanager.h +++ b/xparts/src/interfaces/xpartmanager.h @@ -10,7 +10,7 @@ class XKPartManager : public DCOPObject k_dcop: /** Query a XPart able to handle a given mimetype */ - virtual DCOPRef createPart( TTQString servicetype ) = 0; + virtual DCOPRef createPart( TQString servicetype ) = 0; /** Delete a previously created XPart */ virtual void deletePart( DCOPRef ref ) = 0; 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 <kdebug.h> -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<const KAction *>(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 */ |