diff options
Diffstat (limited to 'xparts')
-rw-r--r-- | xparts/COPYING | 12 | ||||
-rw-r--r-- | xparts/doc/kparts.png | bin | 5916 -> 5917 bytes | |||
-rw-r--r-- | xparts/doc/xparts.html | 20 | ||||
-rw-r--r-- | xparts/mozilla/kmozillapart.cpp | 6 | ||||
-rw-r--r-- | xparts/mozilla/kmozillapart.h | 6 | ||||
-rw-r--r-- | xparts/mozilla/kshell.cpp | 4 | ||||
-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 | 32 | ||||
-rw-r--r-- | xparts/src/kde/xparthost_kpart.h | 16 | ||||
-rw-r--r-- | xparts/xpart_notepad/shell_xparthost.cpp | 4 | ||||
-rw-r--r-- | xparts/xpart_notepad/shell_xparthost.h | 2 | ||||
-rw-r--r-- | xparts/xpart_notepad/xp_notepad.cpp | 28 | ||||
-rw-r--r-- | xparts/xpart_notepad/xp_notepad_factory.cpp | 8 | ||||
-rw-r--r-- | xparts/xpart_notepad/xp_notepad_factory.h | 8 |
22 files changed, 102 insertions, 102 deletions
diff --git a/xparts/COPYING b/xparts/COPYING index 623b6258..818c029f 100644 --- a/xparts/COPYING +++ b/xparts/COPYING @@ -109,9 +109,9 @@ above, provided that you also meet all of these conditions: these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) + the Program is not retquired to print an announcement.) -These requirements apply to the modified work as a whole. If +These retquirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those @@ -177,7 +177,7 @@ However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. - 5. You are not required to accept this License, since you have not + 5. You are not retquired to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by @@ -263,14 +263,14 @@ OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +TO THE TQUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING + 12. IN NO EVENT UNLESS RETQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSETQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER diff --git a/xparts/doc/kparts.png b/xparts/doc/kparts.png Binary files differindex b2d534b3..f2bc0d4a 100644 --- a/xparts/doc/kparts.png +++ b/xparts/doc/kparts.png diff --git a/xparts/doc/xparts.html b/xparts/doc/xparts.html index 0ff872be..ceb67563 100644 --- a/xparts/doc/xparts.html +++ b/xparts/doc/xparts.html @@ -76,13 +76,13 @@ <p>Those advantages are unvaluable for a lightweight and tightly integrated office suite like KOffice. However, there are no silver bullets and most certainly there are drawbacks when the system is - used in settings with different requirements. + used in settings with different retquirements. <p>Take the fourth item, it's comprehensive power while - maintaining simplicity. This was one of the main requirements of + maintaining simplicity. This was one of the main retquirements of the KOffice team, and it alone almost determines an in-process approach with dynamically loadable shared objects. In a generic - browser like Konqueror, the requirements for integrated components + browser like Konqueror, the retquirements for integrated components are not as high as with an office suite. In an office suite, different components operate on one single document, whereas in a browser, the components basically provide different views for @@ -108,7 +108,7 @@ <li>If a component handles the event loop differently from the embedding application, an complete event loop merger is - required. This glueing code can be tricky and might not work well + retquired. This glueing code can be tricky and might not work well in all cases. It's much easier for out-of-process components to provide full toolkit independence. @@ -131,7 +131,7 @@ the networking protocol implementations, the javascript interpreter and whatever else Mozilla.org comes up with. The MozEmbed library works pretty similar to KParts. Once - instantiated, it dynamically loads all libraries required by + instantiated, it dynamically loads all libraries retquired by Mozilla. As an interesting side note, all Unix filemanager projects that utilize Mozilla (for example the Nautilus filemanager) use this library to embed mozilla. This means you are @@ -140,8 +140,8 @@ <p>Now that we have a dynamically loaded Gtk widget, how do we turn that into a KPart? Quite straight forward. There is a - QGtkWidget extension available for Qt, that lets you use Gtk - widgets in your Qt applications. You simply create a QGtkWidget + TQGtkWidget extension available for Qt, that lets you use Gtk + widgets in your Qt applications. You simply create a TQGtkWidget with a pointer to the Gtk widget you get from MozEmbed and insert that into your KPart. Then you do a few trivial reimplementations of the virtual functions of the BrowserExtension interface that @@ -157,11 +157,11 @@ and ugly details. First of all, Mozilla uses the event loop of glib, while Konqueror uses Qt. Unfortunatly, mixing both event loops is not possible with the current release of glib, unless one - want to end up with an application that constantly requires some + want to end up with an application that constantly retquires some CPU to run, even when being idle. While this seems to be ok for today's Java virtual machines, it's not acceptable by KDE's quality standards. Until glib 2.0 is released, you need to patch - glib in order to make the QGtkWidget work properly. No big deal + glib in order to make the TQGtkWidget work properly. No big deal for most Linux users, still a hassle. And keep in mind that glib is a fairly open system. If the component was written in some other toolkit, it might be possible that glueing code is @@ -276,7 +276,7 @@ <p>By writing a small wrapper it is possible to embed any kind of visual component. In addition, we can provide generic wrappers for any kind of visual component model, as long as those models are - powerful enough to describe their interfaces and GUI requirements + powerful enough to describe their interfaces and GUI retquirements at runtime. This includes KParts (eg. KOffice components), Bonobo components (like the Nautilus MP3 viewer) and Uno components provided by OpenOffice (formerly known as StarOffice). diff --git a/xparts/mozilla/kmozillapart.cpp b/xparts/mozilla/kmozillapart.cpp index 8eba1441..3297692d 100644 --- a/xparts/mozilla/kmozillapart.cpp +++ b/xparts/mozilla/kmozillapart.cpp @@ -15,8 +15,8 @@ typedef KParts::GenericFactory<KMozillaPart> KMozillaPartFactory; K_EXPORT_COMPONENT_FACTORY( libkmozillapart, KMozillaPartFactory ); -KMozillaPart::KMozillaPart(TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, const TQStringList &) +KMozillaPart::KMozillaPart(TTQWidget *parentWidget, const char *widgetName, + TTQObject *parent, const char *name, const TTQStringList &) : XPartHost_KPart(parentWidget, widgetName, parent, name) { setInstance( KMozillaPartFactory::instance() ); @@ -36,7 +36,7 @@ KMozillaPart::~KMozillaPart() delete m_partProcess; } -void KMozillaPart::createActions( const TQCString &xmlActions ) +void KMozillaPart::createActions( const TTQCString &xmlActions ) { XPartHost_KPart::createActions( xmlActions ); qDebug("----<<<<<< exit loop"); diff --git a/xparts/mozilla/kmozillapart.h b/xparts/mozilla/kmozillapart.h index a312d894..2455f5eb 100644 --- a/xparts/mozilla/kmozillapart.h +++ b/xparts/mozilla/kmozillapart.h @@ -11,11 +11,11 @@ class KMozillaPart : public XPartHost_KPart Q_OBJECT public: - KMozillaPart(TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, const TQStringList &); + KMozillaPart(TTQWidget *parentWidget, const char *widgetName, + TTQObject *parent, const char *name, const TTQStringList &); virtual ~KMozillaPart(); - virtual void createActions( const TQCString &xmlActions ); + virtual void createActions( const TTQCString &xmlActions ); static KAboutData *createAboutData(); diff --git a/xparts/mozilla/kshell.cpp b/xparts/mozilla/kshell.cpp index e3f87279..8277b02c 100644 --- a/xparts/mozilla/kshell.cpp +++ b/xparts/mozilla/kshell.cpp @@ -34,7 +34,7 @@ public: KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); KSelectAction *s = new KSelectAction( "http://www.kde.org" , 0, actionCollection(), "location" ); - connect( s, TQT_SIGNAL(activated( const TQString& ) ), this, TQT_SLOT( slotOpenUrl( const TQString & ) ) ); + connect( s, TQT_SIGNAL(activated( const TTQString& ) ), this, TQT_SLOT( slotOpenUrl( const TTQString & ) ) ); s->setEditable(true); } virtual ~ShellWindow() @@ -42,7 +42,7 @@ public: delete m_partProcess; } public slots: - void slotOpenUrl( const TQString &url ) + void slotOpenUrl( const TTQString &url ) { kdDebug() << "this=" << this; kdDebug() << "url=" << url << endl; diff --git a/xparts/src/gtk/gtkbrowserextension.c b/xparts/src/gtk/gtkbrowserextension.c index 5885f5c7..36dc374c 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(TQByteArray)" ) == 0 ) + else if ( strcmp( fun, "restoreState(TTQByteArray)" ) == 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(TQByteArray)" ) ); + res = g_list_append( res, g_strdup( "restoreState(TTQByteArray)" ) ); 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(TQCString)", data, + if ( !dcop_client_call( P->client, P->host_app_id, P->host_obj_id, "openURLRequest(TTQCString)", 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(TQString)", data, + if ( !dcop_client_call( P->client, P->host_app_id, "parthost", "setStatusBarText(TTQString)", 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(TQString)", data, + if ( !dcop_client_call( P->client, P->host_app_id, "parthost", "setWindowCaption(TTQString)", 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 2a214123..27040832 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(TQCString)" ) == 0 ) + else if ( strcmp( fun, "openURL(TTQCString)" ) == 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(TQCString,int)" ) == 0 ) + else if ( strcmp( fun, "activateAction(TTQCString,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(TQCString)" ) == 0 ) { + else if ( strcmp( fun, "queryExtension(TTQCString)" ) == 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(TQString url)" ) ); + res = g_list_append( res, g_strdup( "bool openURL(TTQString url)" ) ); res = g_list_append( res, g_strdup( "bool closeURL()" ) ); - res = g_list_append( res, g_strdup( "queryExtension(TQCString)" ) ); + res = g_list_append( res, g_strdup( "queryExtension(TTQCString)" ) ); 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(TQCString)", data ) ) { + if( !dcop_client_send( d->client, d->host_app_id, d->host_obj_id, "createActions(TTQCString)", 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 b097ab65..b4be1224 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 TQByteArray saveState() = 0; - virtual void restoreState( TQByteArray state ) = 0; + virtual TTQByteArray saveState() = 0; + virtual void restoreState( TTQByteArray state ) = 0; }; #endif diff --git a/xparts/src/interfaces/xbrowsersignals.h b/xparts/src/interfaces/xbrowsersignals.h index a4869e02..9b6704ab 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 TQCString &url) = 0; - virtual ASYNC createNewWindow( const TQCString &url ) = 0; + virtual ASYNC openURLRequest( const TTQCString &url) = 0; + virtual ASYNC createNewWindow( const TTQCString &url ) = 0; }; #endif diff --git a/xparts/src/interfaces/xpart.h b/xparts/src/interfaces/xpart.h index 1d323a5d..8b2e3a3c 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 TQCString& url ) = 0; + virtual bool openURL( const TTQCString& 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 TQString &name, int state ) = 0; + virtual ASYNC activateAction( const TTQString &name, int state ) = 0; /** Are extentions available -> browser extension / TextEditor ? */ - virtual DCOPRef queryExtension( const TQCString& extension ) = 0; + virtual DCOPRef queryExtension( const TTQCString& extension ) = 0; }; diff --git a/xparts/src/interfaces/xparthost.h b/xparts/src/interfaces/xparthost.h index 75c6f4e0..3cbede0f 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(TQCString name) : DCOPObject(name) {} + XPartHost(TTQCString 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 TQCString &xmlActions ) = 0; + virtual ASYNC createActions( const TTQCString &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 TQString &caption ) = 0; + virtual ASYNC setWindowCaption( const TTQString &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 TQString &text ) = 0; + virtual ASYNC setStatusBarText( const TTQString &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 TQString &errMsg ) = 0; + virtual ASYNC canceled( const TTQString &errMsg ) = 0; }; diff --git a/xparts/src/interfaces/xpartmanager.h b/xparts/src/interfaces/xpartmanager.h index 25a341f8..7838fff1 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( TQString servicetype ) = 0; + virtual DCOPRef createPart( TTQString 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 18c58362..8daa1a54 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 TQCString &url) +void KBrowserSignals::openURLRequest( const TTQCString &url) { - KURL u = TQString(url); + KURL u = TTQString(url); emit KParts::BrowserExtension::openURLRequest(u); } -void KBrowserSignals::createNewWindow( const TQCString &url ) +void KBrowserSignals::createNewWindow( const TTQCString &url ) { } diff --git a/xparts/src/kde/kbrowsersignals.h b/xparts/src/kde/kbrowsersignals.h index 3bd29a7f..6ef31433 100644 --- a/xparts/src/kde/kbrowsersignals.h +++ b/xparts/src/kde/kbrowsersignals.h @@ -16,8 +16,8 @@ public: virtual ~KBrowserSignals(); - virtual ASYNC openURLRequest( const TQCString &url); - virtual ASYNC createNewWindow( const TQCString &url ); + virtual ASYNC openURLRequest( const TTQCString &url); + virtual ASYNC createNewWindow( const TTQCString &url ); protected: XPartHost_KPart *part; diff --git a/xparts/src/kde/xparthost_kpart.cpp b/xparts/src/kde/xparthost_kpart.cpp index 807ada77..0ad0e952 100644 --- a/xparts/src/kde/xparthost_kpart.cpp +++ b/xparts/src/kde/xparthost_kpart.cpp @@ -14,14 +14,14 @@ #include <kdebug.h> -XPartHost_KPart::XPartHost_KPart( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name ) +XPartHost_KPart::XPartHost_KPart( TTQWidget *parentWidget, const char *widgetName, + TTQObject *parent, const char *name ) : KParts::ReadOnlyPart( parent, name ), XPartHost("parthost") { m_stub = 0; be = 0; - embed = new QXEmbed(parentWidget, widgetName); + embed = new TQXEmbed(parentWidget, widgetName); setWidget(embed); } @@ -57,24 +57,24 @@ DCOPRef XPartHost_KPart::registerXPart( const DCOPRef &part ) } -void XPartHost_KPart::createActions( const TQCString &xmlActions ) +void XPartHost_KPart::createActions( const TTQCString &xmlActions ) { qDebug("--> createActions"); // creates a set of actions and adds them to the actionCollection - TQDomDocument d; + TTQDomDocument d; d.setContent( xmlActions ); - TQDomElement docElem = d.documentElement(); + TTQDomElement docElem = d.documentElement(); kdDebug() << "docElement is " << docElem.tagName() << endl; - TQDomNode n = docElem.firstChild(); + TTQDomNode n = docElem.firstChild(); while( !n.isNull() ) { - TQDomElement e = n.toElement(); + TTQDomElement e = n.toElement(); if( !e.isNull() ) { if ( e.tagName() == "Action") { - TQString name = e.attribute("name"); - TQString type = e.attribute("type"); + TTQString name = e.attribute("name"); + TTQString 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 TQCString &xmlActions ) new KToggleAction( name, 0, this, TQT_SLOT( actionActivated() ), actionCollection(), name.latin1() ); kdDebug() << "action=" << name << " type=" << type << endl; } else if ( e.tagName() == "XMLFile" ) { - TQString location = e.attribute("location"); + TTQString location = e.attribute("location"); setXMLFile(location); } } @@ -92,12 +92,12 @@ void XPartHost_KPart::createActions( const TQCString &xmlActions ) } -void XPartHost_KPart::setWindowCaption( const TQString &caption ) +void XPartHost_KPart::setWindowCaption( const TTQString &caption ) { emit KParts::ReadOnlyPart::setWindowCaption( caption ); } -void XPartHost_KPart::setStatusBarText( const TQString &text ) +void XPartHost_KPart::setStatusBarText( const TTQString &text ) { emit KParts::ReadOnlyPart::setStatusBarText( text ); } @@ -112,7 +112,7 @@ void XPartHost_KPart::completed() emit KParts::ReadOnlyPart::completed(); } -void XPartHost_KPart::canceled( const TQString &errMsg ) +void XPartHost_KPart::canceled( const TTQString &errMsg ) { emit KParts::ReadOnlyPart::canceled( errMsg ); } @@ -131,12 +131,12 @@ bool XPartHost_KPart::closeURL() void XPartHost_KPart::actionActivated() { - const TQObject *o = sender(); + const TTQObject *o = sender(); if( !o->inherits("KAction") ) return; const KAction *action = static_cast<const KAction *>(o); - TQString name = action->text(); + TTQString 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 527178d2..9428fc0a 100644 --- a/xparts/src/kde/xparthost_kpart.h +++ b/xparts/src/kde/xparthost_kpart.h @@ -7,7 +7,7 @@ class XPart_stub; class KBrowserSignals; -class QXEmbed; +class TQXEmbed; /** @@ -21,8 +21,8 @@ class XPartHost_KPart : public KParts::ReadOnlyPart, public XPartHost { Q_OBJECT public: - XPartHost_KPart( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name ); + XPartHost_KPart( TTQWidget *parentWidget, const char *widgetName, + TTQObject *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 TQCString &xmlActions ); + virtual ASYNC createActions( const TTQCString &xmlActions ); /** Emitted by the XPart, to be transfered to the KPart host */ - virtual ASYNC setWindowCaption( const TQString &caption ); + virtual ASYNC setWindowCaption( const TTQString &caption ); /** Emitted by the XPart, to be transfered to the KPart host */ - virtual ASYNC setStatusBarText( const TQString &text ); + virtual ASYNC setStatusBarText( const TTQString &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 TQString &errMsg ); + virtual ASYNC canceled( const TTQString &errMsg ); // reimplemented from KReadOnlyPart /** function called by the KPart host to be forwarded to the XPart */ @@ -68,7 +68,7 @@ private: DCOPRef m_part; XPart_stub *m_stub; KBrowserSignals *be; - QXEmbed *embed; + TQXEmbed *embed; }; #endif diff --git a/xparts/xpart_notepad/shell_xparthost.cpp b/xparts/xpart_notepad/shell_xparthost.cpp index d043d766..ce3b4e3b 100644 --- a/xparts/xpart_notepad/shell_xparthost.cpp +++ b/xparts/xpart_notepad/shell_xparthost.cpp @@ -32,7 +32,7 @@ ShellWindow::ShellWindow() KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); KSelectAction *s = new KSelectAction( "http://www.kde.org" , 0, actionCollection(), "location" ); - connect( s, TQT_SIGNAL(activated( const TQString& ) ), this, TQT_SLOT( slotOpenUrl( const TQString & ) ) ); + connect( s, TQT_SIGNAL(activated( const TTQString& ) ), this, TQT_SLOT( slotOpenUrl( const TTQString & ) ) ); s->setEditable(true); kdDebug() << "KShell window created" << endl; @@ -48,7 +48,7 @@ void ShellWindow::hop() kdDebug() << "hop called!" << endl; } -void ShellWindow::slotOpenUrl( const TQString &url ) +void ShellWindow::slotOpenUrl( const TTQString &url ) { kdDebug() << "this=" << this; kdDebug() << "url=" << url << endl; diff --git a/xparts/xpart_notepad/shell_xparthost.h b/xparts/xpart_notepad/shell_xparthost.h index f65cdf1b..89f3e3c4 100644 --- a/xparts/xpart_notepad/shell_xparthost.h +++ b/xparts/xpart_notepad/shell_xparthost.h @@ -18,7 +18,7 @@ public: public slots: void hop(); - void slotOpenUrl( const TQString &url ); + void slotOpenUrl( const TTQString &url ); void mergeGUI(); private: diff --git a/xparts/xpart_notepad/xp_notepad.cpp b/xparts/xpart_notepad/xp_notepad.cpp index 5dc7157c..98f9d5dc 100644 --- a/xparts/xpart_notepad/xp_notepad.cpp +++ b/xparts/xpart_notepad/xp_notepad.cpp @@ -10,7 +10,7 @@ #include "xparthost_stub.h" -class XPartNotepad : public TQMultiLineEdit, virtual public XPart +class XPartNotepad : public TTQMultiLineEdit, virtual public XPart { public: @@ -19,7 +19,7 @@ public: setText("This is a xpart component editor"); setReadOnly( false ); resize( 200, 200 ); - TQMultiLineEdit::setFocus(); + TTQMultiLineEdit::setFocus(); } /** needed by XPartManager to embed the part */ @@ -28,17 +28,17 @@ public: /** used by XPartManager to show the part */ void show() - { printf("show()\n"); TQWidget::show(); } + { printf("show()\n"); TTQWidget::show(); } /** sent by the XPartHost to query an url */ - bool openURL( const TQCString& url ) + bool openURL( const TTQCString& url ) { printf("openURL %s\n", (const char *) url ); - TQFile f(url); - TQString s; + TTQFile f(url); + TTQString s; if ( ! f.open(IO_ReadOnly) ) { return false; } - TQTextStream t( &f ); + TTQTextStream t( &f ); while ( !t.eof() ) { s += t.readLine() + "\n"; } @@ -56,20 +56,20 @@ public: * * action, state is used with Toggle actions to * precise the current state. * */ - void activateAction( const TQString &name, int state ) + void activateAction( const TTQString &name, int state ) { printf("activateAction: %s, %d\n", name.latin1(), state ); } /** are extentions available -> browser extension * / TextEditor ? */ - DCOPRef queryExtension( const TQCString& extension ) + DCOPRef queryExtension( const TTQCString& extension ) { printf("query Extension : %s\n", (const char * ) extension ); return DCOPRef(); } protected: - void focusInEvent( TQFocusEvent * ) - { kdDebug() << "Focus in" << endl; TQMultiLineEdit::setFocus(); } - void focusOutEvent( TQFocusEvent * ) - { kdDebug() << "Focus Out" << endl;TQMultiLineEdit::setFocus(); } + void focusInEvent( TTQFocusEvent * ) + { kdDebug() << "Focus in" << endl; TTQMultiLineEdit::setFocus(); } + void focusOutEvent( TTQFocusEvent * ) + { kdDebug() << "Focus Out" << endl;TTQMultiLineEdit::setFocus(); } }; int main( int argc, char **argv ) @@ -84,7 +84,7 @@ int main( int argc, char **argv ) XPartNotepad * xpn = new XPartNotepad("xp_notepad"); app.setMainWidget( xpn ); app.dcopClient()->attach(); - TQCString appId = app.dcopClient()->registerAs("xp_notepad", true); + TTQCString appId = app.dcopClient()->registerAs("xp_notepad", true); XPartHost_stub xph_stub( argv[1], argv[2] ); DCOPRef xpn_dcopref( xpn ); diff --git a/xparts/xpart_notepad/xp_notepad_factory.cpp b/xparts/xpart_notepad/xp_notepad_factory.cpp index 59cf0499..826ffa77 100644 --- a/xparts/xpart_notepad/xp_notepad_factory.cpp +++ b/xparts/xpart_notepad/xp_notepad_factory.cpp @@ -38,13 +38,13 @@ extern "C" }; -KParts::Part *XP_NotepadFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList & ) +KParts::Part *XP_NotepadFactory::createPartObject( TTQWidget *parentWidget, const char *widgetName, TTQObject *parent, const char *name, const char *className, const TTQStringList & ) { return new XP_NotepadPart( parentWidget, widgetName, parent, name ); } -XP_NotepadPart::XP_NotepadPart(TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name) +XP_NotepadPart::XP_NotepadPart(TTQWidget *parentWidget, const char *widgetName, + TTQObject *parent, const char *name) : XPartHost_KPart(parentWidget, widgetName, parent, name) { m_partProcess = new KProcess; @@ -62,7 +62,7 @@ XP_NotepadPart::~XP_NotepadPart() delete m_partProcess; } -void XP_NotepadPart::createActions( const TQCString &xmlActions ) +void XP_NotepadPart::createActions( const TTQCString &xmlActions ) { XPartHost_KPart::createActions( xmlActions ); qDebug("----<<<<<< exit loop"); diff --git a/xparts/xpart_notepad/xp_notepad_factory.h b/xparts/xpart_notepad/xp_notepad_factory.h index 018a5619..bc0022c2 100644 --- a/xparts/xpart_notepad/xp_notepad_factory.h +++ b/xparts/xpart_notepad/xp_notepad_factory.h @@ -39,7 +39,7 @@ public: XP_NotepadFactory( bool clone = false ) {} virtual ~XP_NotepadFactory() {} - virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ); + virtual KParts::Part *createPartObject( TTQWidget *parentWidget, const char *widgetName, TTQObject *parent, const char *name, const char *className, const TTQStringList &args ); }; @@ -50,11 +50,11 @@ class XP_NotepadPart : public XPartHost_KPart Q_OBJECT public: - XP_NotepadPart(TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name); + XP_NotepadPart(TTQWidget *parentWidget, const char *widgetName, + TTQObject *parent, const char *name); virtual ~XP_NotepadPart(); - virtual void createActions( const TQCString &xmlActions ); + virtual void createActions( const TTQCString &xmlActions ); private: KProcess *m_partProcess; }; |