diff options
Diffstat (limited to 'interfaces')
103 files changed, 673 insertions, 673 deletions
diff --git a/interfaces/khexedit/byteseditinterface.h b/interfaces/khexedit/byteseditinterface.h index dbc4c96bd..dc0a9dca5 100644 --- a/interfaces/khexedit/byteseditinterface.h +++ b/interfaces/khexedit/byteseditinterface.h @@ -21,7 +21,7 @@ // kde specific #include <kparts/componentfactory.h> -#include <qwidget.h> +#include <tqwidget.h> /** * @short KHE (short for KHexEdit) is KDE's namespace for all things related @@ -64,7 +64,7 @@ namespace KHE * \code * BytesEdit->setMaxDataSize( MaxDataSize ); * ... - * QByteArray BA; + * TQByteArray BA; * BA.setRawData( BytesEdit->data(), BytesEdit->dataSize() ); * \endcode * </ul> @@ -173,7 +173,7 @@ inline BytesEditInterface *bytesEditInterface( T *t ) * #include <khexedit/clipboardinterface.h> * ... * - * QWidget *BytesEditWidget = KHE::createBytesEditWidget( this, "BytesEditWidget" ); + * TQWidget *BytesEditWidget = KHE::createBytesEditWidget( this, "BytesEditWidget" ); * // is e.g. kdeutils (incl. khexedit2) installed, so a widget could be found and created? * if( BytesEditWidget ) * { @@ -205,8 +205,8 @@ inline BytesEditInterface *bytesEditInterface( T *t ) * KHE::ClipboardInterface *Clipboard = KHE::clipboardInterface( BytesEditWidget ); * if( Clipboard ) * { - * // Yes, use BytesEditWidget, not Clipboard, because that's the QObject, indeed hacky... - * connect( BytesEditWidget, SIGNAL(copyAvailable(bool)), this, SLOT(offerCopy(bool)) ); + * // Yes, use BytesEditWidget, not Clipboard, because that's the TQObject, indeed hacky... + * connect( BytesEditWidget, TQT_SIGNAL(copyAvailable(bool)), this, TQT_SLOT(offerCopy(bool)) ); * } * } * \endcode @@ -218,10 +218,10 @@ inline BytesEditInterface *bytesEditInterface( T *t ) * @see BytesEditInterface, ValueColumnInterface, CharColumnInterface, ZoomInterface, ClipboardInterface * @since 3.2 */ -inline QWidget *createBytesEditWidget( QWidget *Parent = 0, const char *Name = 0 ) +inline TQWidget *createBytesEditWidget( TQWidget *Parent = 0, const char *Name = 0 ) { - return KParts::ComponentFactory::createInstanceFromQuery<QWidget> - ( QString::fromLatin1("KHexEdit/KBytesEdit"), QString::null, Parent, Name ); + return KParts::ComponentFactory::createInstanceFromQuery<TQWidget> + ( TQString::fromLatin1("KHexEdit/KBytesEdit"), TQString::null, Parent, Name ); } } diff --git a/interfaces/khexedit/charcolumninterface.h b/interfaces/khexedit/charcolumninterface.h index aef282fdc..4221de0c4 100644 --- a/interfaces/khexedit/charcolumninterface.h +++ b/interfaces/khexedit/charcolumninterface.h @@ -18,7 +18,7 @@ #ifndef CHARCOLUMNINTERFACE_H #define CHARCOLUMNINTERFACE_H -#include <qstring.h> +#include <tqstring.h> namespace KHE { @@ -59,7 +59,7 @@ class CharColumnInterface * @param SC new character * @see substituteChar() */ - virtual void setSubstituteChar( QChar SC ) = 0; + virtual void setSubstituteChar( TQChar SC ) = 0; /** sets the encoding of the text column. * If the encoding is not available the format will not be changed. * Default is @c LocalEncoding. @@ -78,7 +78,7 @@ class CharColumnInterface /** @return the currently used substitute character for "unprintable" chars. * @see setSubstituteChar() */ - virtual QChar substituteChar() const = 0; + virtual TQChar substituteChar() const = 0; /** @return the currently used encoding * @see setEncoding() */ diff --git a/interfaces/khexedit/clipboardinterface.h b/interfaces/khexedit/clipboardinterface.h index 9edab8521..eeaf9d391 100644 --- a/interfaces/khexedit/clipboardinterface.h +++ b/interfaces/khexedit/clipboardinterface.h @@ -26,7 +26,7 @@ namespace KHE * * This interface enables the interaction with the clipboard. It relies on the * possibilities of signal/slot so a class B that implements this interface - * should be derived from QObject. When connecting to a signal or a slot + * should be derived from TQObject. When connecting to a signal or a slot * the class B has to be used, not the interface. * <p> * Example: @@ -34,8 +34,8 @@ namespace KHE * KHE::ClipboardInterface *Clipboard = KHE::clipboardInterface( BytesEditWidget ); * if( Clipboard ) * { - * // Yes, use BytesEditWidget, not Clipboard, because that's the QObject, indeed hacky... - * connect( BytesEditWidget, SIGNAL(copyAvailable(bool)), this, SLOT(offerCopy(bool)) ); + * // Yes, use BytesEditWidget, not Clipboard, because that's the TQObject, indeed hacky... + * connect( BytesEditWidget, TQT_SIGNAL(copyAvailable(bool)), this, TQT_SLOT(offerCopy(bool)) ); * } * \endcode * diff --git a/interfaces/kimproxy/interface/kimiface.h b/interfaces/kimproxy/interface/kimiface.h index 4cc1d88b5..f3212df6d 100644 --- a/interfaces/kimproxy/interface/kimiface.h +++ b/interfaces/kimproxy/interface/kimiface.h @@ -22,9 +22,9 @@ #ifndef KIMIFACE_H #define KIMIFACE_H -#include <qpixmap.h> +#include <tqpixmap.h> #include <dcopobject.h> -#include <qstringlist.h> +#include <tqstringlist.h> #include <kurl.h> /** @@ -57,16 +57,16 @@ * @endcode * and the class implementing KIMIface must pass "KIMIface" to the DCOPObject constructor: * @code - * // just need QObject inheritance and Q_OBJECT if you want signals and slots + * // just need TQObject inheritance and Q_OBJECT if you want signals and slots * // no need to use K_DCOP macro again * - * class MyIMIface : public QObject, public KIMIface + * class MyIMIface : public TQObject, public KIMIface * { * Q_OBJECT * public: - * MyIMIface(QObject* parent = 0, const char* name) : + * MyIMIface(TQObject* parent = 0, const char* name) : * DCOPObject("KIMIface"), // <-- passing the interface name as required - * QObject(parent, name) {} + * TQObject(parent, name) {} * }; * @endcode * @@ -102,7 +102,7 @@ k_dcop: * @see isPresent() * @see KABC::Addressee::uid() */ - virtual QStringList allContacts() = 0; + virtual TQStringList allContacts() = 0; /** * @brief Obtain a list of IM-contacts that are currently reachable @@ -122,7 +122,7 @@ k_dcop: * @see messageContact() * @see KABC::Addressee::uid() */ - virtual QStringList reachableContacts() = 0; + virtual TQStringList reachableContacts() = 0; /** * @brief Obtain a list of IM-contacts that are currently online @@ -140,7 +140,7 @@ k_dcop: * @see chatWithContact() * @see KABC::Addressee::uid() */ - virtual QStringList onlineContacts() = 0; + virtual TQStringList onlineContacts() = 0; /** * @brief Obtain a list of IM-contacts who may receive file transfers @@ -165,7 +165,7 @@ k_dcop: * @see sendFile() * @see KABC::Addressee::uid() */ - virtual QStringList fileTransferContacts() = 0; + virtual TQStringList fileTransferContacts() = 0; // individual /** @@ -182,7 +182,7 @@ k_dcop: * @see presenceStatus() * @see KABC::Addressee::uid() */ - virtual bool isPresent( const QString & uid ) = 0; + virtual bool isPresent( const TQString & uid ) = 0; /** * @brief Obtain the IM app's idea of the contact's display name @@ -192,7 +192,7 @@ k_dcop: * a nick name, a user configured name string, etc. * * @param uid the KABC UID you are interested in - * @return the corresponding display name or QString:null if the + * @return the corresponding display name or TQString:null if the * UID is unknown * * @see isPresent() @@ -200,7 +200,7 @@ k_dcop: * @see presenceStatus() * @see KABC::Addressee::uid() */ - virtual QString displayName( const QString & uid ) = 0; + virtual TQString displayName( const TQString & uid ) = 0; /** * @brief Obtain the IM presence as a i18ned string for the specified @@ -211,13 +211,13 @@ k_dcop: * * @param uid the KABC UID you want the presence for * @return the i18ned string describing the contact's presence or - * QString::null if the UID is unknown + * TQString::null if the UID is unknown * * @see isPresent() * @see presenceStatus() * @see KABC::Addressee::uid() */ - virtual QString presenceString( const QString & uid ) = 0; + virtual TQString presenceString( const TQString & uid ) = 0; /** * @brief Obtain the IM presence as a number for the specified contact @@ -247,7 +247,7 @@ k_dcop: * @see presenceString() * @see KABC::Addressee::uid() */ - virtual int presenceStatus( const QString & uid ) = 0; + virtual int presenceStatus( const TQString & uid ) = 0; /** * @brief Indicate if a given contact can receive files @@ -258,7 +258,7 @@ k_dcop: * @see fileTransferContacts() * @see KABC::Addressee::uid() */ - virtual bool canReceiveFiles( const QString & uid ) = 0; + virtual bool canReceiveFiles( const TQString & uid ) = 0; /** * @brief Indicate if a given contact will be able to respond @@ -276,7 +276,7 @@ k_dcop: * @see isPresent() * @see KABC::Addressee::uid() */ - virtual bool canRespond( const QString & uid ) = 0; + virtual bool canRespond( const TQString & uid ) = 0; /** * @brief Obtain the KABC UID corresponding to the given IM address @@ -284,7 +284,7 @@ k_dcop: * @param contactId the protocol specific identifier for the contact, * e.g. UIN for ICQ, screenname for AIM, nick for IRC * @param protocol the IM protocol/service to check. See protocols() - * @return the KABC UID for the given contact or @c QString::null if not + * @return the KABC UID for the given contact or @c TQString::null if not * found or either input stream was empty or the protocol is not * supported * @@ -293,7 +293,7 @@ k_dcop: * @see isPresent() * @see KABC::Addressee::uid() */ - virtual QString locate( const QString & contactId, const QString & protocol ) = 0; + virtual TQString locate( const TQString & contactId, const TQString & protocol ) = 0; // metadata /** @@ -305,29 +305,29 @@ k_dcop: * * @param uid the KABC UID you want the presence icon for * @return a pixmap representing the contact's presence or a null pixmap - * if the contact is unknown. See QPixmap::isNull() + * if the contact is unknown. See TQPixmap::isNull() * * @see isPresent() * @see presenceString() * @see presenceStatus() * @see KABC::Addressee::uid() */ - virtual QPixmap icon( const QString & uid ) = 0; + virtual TQPixmap icon( const TQString & uid ) = 0; /** * @brief Obtain the given contact's current context (home, work, or any) * * Not all IM services/protocols support the concept of contexts. If the - * given UID maps to such a service, just return @c QString::null + * given UID maps to such a service, just return @c TQString::null * * @param uid the KABC UID you want the context for - * @return a string describing the context, or @c QString::null if not + * @return a string describing the context, or @c TQString::null if not * supported or if the contact is unknown * * @see isPresent() * @see KABC::Addressee::uid() */ - virtual QString context( const QString & uid ) = 0; + virtual TQString context( const TQString & uid ) = 0; // App capabilities /** @@ -349,7 +349,7 @@ k_dcop: * @see addContact() * @see messageNewContact */ - virtual QStringList protocols() = 0; + virtual TQStringList protocols() = 0; // ACTORS /** @@ -374,7 +374,7 @@ k_dcop: * @see reachableContacts() * @see KABC::Addressee::uid() */ - virtual void messageContact( const QString &uid, const QString& message ) = 0; + virtual void messageContact( const TQString &uid, const TQString& message ) = 0; /** * @brief Send a single message to a contact given only its protocol @@ -394,7 +394,7 @@ k_dcop: * @see protocols() * @see addContact() */ - virtual void messageNewContact( const QString &contactId, const QString &protocol ) = 0; + virtual void messageNewContact( const TQString &contactId, const TQString &protocol ) = 0; /** * @brief Start a chat session with the specified contact @@ -412,7 +412,7 @@ k_dcop: * @see reachableContacts() * @see KABC::Addressee::uid() */ - virtual void chatWithContact( const QString &uid ) = 0; + virtual void chatWithContact( const TQString &uid ) = 0; /** * @brief Send a file to the contact @@ -438,8 +438,8 @@ k_dcop: * @see fileTransferContacts() * @see KABC::Addressee::uid() */ - virtual void sendFile(const QString &uid, const KURL &sourceURL, - const QString &altFileName = QString::null, uint fileSize = 0) = 0; + virtual void sendFile(const TQString &uid, const KURL &sourceURL, + const TQString &altFileName = TQString::null, uint fileSize = 0) = 0; // MUTATORS // Contact list @@ -460,7 +460,7 @@ k_dcop: * @see protocols() * @see messageNewContact() */ - virtual bool addContact( const QString &contactId, const QString &protocol ) = 0; + virtual bool addContact( const TQString &contactId, const TQString &protocol ) = 0; // SIGNALS k_dcop_signals: @@ -482,7 +482,7 @@ k_dcop_signals: * @see KABC::Addressee::uid() * @see DCOPClient::appId() */ - void contactPresenceChanged( QString uid, QCString appId, int presence ); + void contactPresenceChanged( TQString uid, TQCString appId, int presence ); }; #endif diff --git a/interfaces/kimproxy/library/kimproxy.cpp b/interfaces/kimproxy/library/kimproxy.cpp index 746c6da90..d3cf1ef24 100644 --- a/interfaces/kimproxy/library/kimproxy.cpp +++ b/interfaces/kimproxy/library/kimproxy.cpp @@ -21,8 +21,8 @@ Boston, MA 02110-1301, USA. */ -#include <qglobal.h> -#include <qpixmapcache.h> +#include <tqglobal.h> +#include <tqpixmapcache.h> #include <dcopclient.h> #include <kapplication.h> #include <kdcopservicestarter.h> @@ -43,11 +43,11 @@ KIMProxy * KIMProxy::s_instance = 0L; struct AppPresenceCurrent { - QCString appId; + TQCString appId; int presence; }; -class ContactPresenceListCurrent : public QValueList<AppPresenceCurrent> +class ContactPresenceListCurrent : public TQValueList<AppPresenceCurrent> { public: // return value indicates if the supplied parameter was better than any existing presence @@ -60,9 +60,9 @@ struct KIMProxy::Private { DCOPClient * dc; // list of the strings in use by KIMIface - QStringList presence_strings; + TQStringList presence_strings; // list of the icon names in use by KIMIface - QStringList presence_icons; + TQStringList presence_icons; // map of presences PresenceStringMap presence_map; }; @@ -140,11 +140,11 @@ AppPresenceCurrent ContactPresenceListCurrent::best() // return best; // } // -// QCString bestAppId( AppPresence* ap ) +// TQCString bestAppId( AppPresence* ap ) // { // Q_ASSERT( ap ); // AppPresence::const_iterator it; -// QCString bestAppId; +// TQCString bestAppId; // it = ap->begin(); // if ( it != ap->end() ) // { @@ -175,14 +175,14 @@ KIMProxy * KIMProxy::instance( DCOPClient * client ) return 0L; } -KIMProxy::KIMProxy( DCOPClient* dc ) : DCOPObject( "KIMProxyIface" ), QObject(), d( new Private ) +KIMProxy::KIMProxy( DCOPClient* dc ) : DCOPObject( "KIMProxyIface" ), TQObject(), d( new Private ) { m_im_client_stubs.setAutoDelete( true ); d->dc = dc; m_initialized = false; - connect( d->dc, SIGNAL( applicationRemoved( const QCString& ) ) , this, SLOT( unregisteredFromDCOP( const QCString& ) ) ); - connect( d->dc, SIGNAL( applicationRegistered( const QCString& ) ) , this, SLOT( registeredToDCOP( const QCString& ) ) ); + connect( d->dc, TQT_SIGNAL( applicationRemoved( const TQCString& ) ) , this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); + connect( d->dc, TQT_SIGNAL( applicationRegistered( const TQCString& ) ) , this, TQT_SLOT( registeredToDCOP( const TQCString& ) ) ); d->dc->setNotifications( true ); d->presence_strings.append( "Unknown" ); @@ -197,14 +197,14 @@ KIMProxy::KIMProxy( DCOPClient* dc ) : DCOPObject( "KIMProxyIface" ), QObject(), d->presence_icons.append( "presence_away" ); d->presence_icons.append( "presence_online" ); - //QCString senderApp = "Kopete"; - //QCString senderObjectId = "KIMIface"; - QCString method = "contactPresenceChanged( QString, QCString, int )"; - //QCString receiverObjectId = "KIMProxyIface"; + //TQCString senderApp = "Kopete"; + //TQCString senderObjectId = "KIMIface"; + TQCString method = "contactPresenceChanged( TQString, TQCString, int )"; + //TQCString receiverObjectId = "KIMProxyIface"; // FIXME: make this work when the sender object id is set to KIMIFace if ( !connectDCOPSignal( 0, 0, method, method, false ) ) - KMessageBox::information( 0, QString( "Couldn't connect DCOP signal.\nWon't receive any status notifications!" ) ); + KMessageBox::information( 0, TQString( "Couldn't connect DCOP signal.\nWon't receive any status notifications!" ) ); } KIMProxy::~KIMProxy( ) @@ -221,12 +221,12 @@ bool KIMProxy::initialize() if ( KServiceType::serviceType( IM_SERVICE_TYPE ) ) { //kdDebug( 790 ) << k_funcinfo << endl; - QCString dcopObjectId = "KIMIface"; + TQCString dcopObjectId = "KIMIface"; // see what apps implementing our service type are out there KService::List offers = KServiceType::offers( IM_SERVICE_TYPE ); KService::List::iterator offer; - typedef QValueList<QCString> QCStringList; + typedef TQValueList<TQCString> QCStringList; QCStringList registeredApps = d->dc->registeredApplications(); QCStringList::iterator app; const QCStringList::iterator end = registeredApps.end(); @@ -237,12 +237,12 @@ bool KIMProxy::initialize() //for each offer for ( offer = offers.begin(); offer != offers.end(); ++offer ) { - QCString dcopService = (*offer)->property("X-DCOP-ServiceName").toString().latin1(); + TQCString dcopService = (*offer)->property("X-DCOP-ServiceName").toString().latin1(); if ( !dcopService.isEmpty() ) { //kdDebug( 790 ) << " is it: " << dcopService << "?" << endl; // get the application name ( minus any process ID ) - QCString instanceName = (*app).left( dcopService.length() ); + TQCString instanceName = (*app).left( dcopService.length() ); // if the application implements the dcop service, add it if ( instanceName == dcopService ) { @@ -263,7 +263,7 @@ bool KIMProxy::initialize() return !m_im_client_stubs.isEmpty(); } -void KIMProxy::registeredToDCOP( const QCString& appId ) +void KIMProxy::registeredToDCOP( const TQCString& appId ) { //kdDebug( 790 ) << k_funcinfo << " appId '" << appId << "'" << endl; // check that appId implements our service @@ -279,8 +279,8 @@ void KIMProxy::registeredToDCOP( const QCString& appId ) KService::List::const_iterator it; for ( it = offers.begin(); it != offers.end(); ++it ) { - QCString dcopObjectId = "KIMIface"; - QCString dcopService = (*it)->property("X-DCOP-ServiceName").toString().latin1(); + TQCString dcopObjectId = "KIMIface"; + TQCString dcopService = (*it)->property("X-DCOP-ServiceName").toString().latin1(); if ( appId.left( dcopService.length() ) == dcopService ) { // if it's not already known, insert it @@ -298,7 +298,7 @@ void KIMProxy::registeredToDCOP( const QCString& appId ) // emit sigPresenceInfoExpired(); } -void KIMProxy::unregisteredFromDCOP( const QCString& appId ) +void KIMProxy::unregisteredFromDCOP( const TQCString& appId ) { //kdDebug( 790 ) << k_funcinfo << appId << endl; if ( m_im_client_stubs.find( appId ) ) @@ -325,7 +325,7 @@ void KIMProxy::unregisteredFromDCOP( const QCString& appId ) } } -void KIMProxy::contactPresenceChanged( QString uid, QCString appId, int presence ) +void KIMProxy::contactPresenceChanged( TQString uid, TQCString appId, int presence ) { // update the presence map //kdDebug( 790 ) << k_funcinfo << "uid: " << uid << " appId: " << appId << " presence " << presence << endl; @@ -343,7 +343,7 @@ void KIMProxy::contactPresenceChanged( QString uid, QCString appId, int presence } } -int KIMProxy::presenceNumeric( const QString& uid ) +int KIMProxy::presenceNumeric( const TQString& uid ) { AppPresenceCurrent ap; ap.presence = 0; @@ -355,7 +355,7 @@ int KIMProxy::presenceNumeric( const QString& uid ) return ap.presence; } -QString KIMProxy::presenceString( const QString& uid ) +TQString KIMProxy::presenceString( const TQString& uid ) { AppPresenceCurrent ap; ap.presence = 0; @@ -365,12 +365,12 @@ QString KIMProxy::presenceString( const QString& uid ) ap = presence.best(); } if ( ap.appId.isEmpty() ) - return QString::null; + return TQString::null; else return d->presence_strings[ ap.presence ]; } -QPixmap KIMProxy::presenceIcon( const QString& uid ) +TQPixmap KIMProxy::presenceIcon( const TQString& uid ) { AppPresenceCurrent ap; ap.presence = 0; @@ -381,8 +381,8 @@ QPixmap KIMProxy::presenceIcon( const QString& uid ) } if ( ap.appId.isEmpty() ) { - //kdDebug( 790 ) << k_funcinfo << "returning a null QPixmap because we were asked for an icon for a uid we know nothing about" << endl; - return QPixmap(); + //kdDebug( 790 ) << k_funcinfo << "returning a null TQPixmap because we were asked for an icon for a uid we know nothing about" << endl; + return TQPixmap(); } else { @@ -391,19 +391,19 @@ QPixmap KIMProxy::presenceIcon( const QString& uid ) } } -QStringList KIMProxy::allContacts() +TQStringList KIMProxy::allContacts() { - QStringList value = d->presence_map.keys(); + TQStringList value = d->presence_map.keys(); return value; } -QStringList KIMProxy::reachableContacts() +TQStringList KIMProxy::reachableContacts() { - QStringList value; + TQStringList value; if ( initialize() ) { - QDictIterator<KIMIface_stub> it( m_im_client_stubs ); + TQDictIterator<KIMIface_stub> it( m_im_client_stubs ); for ( ; it.current(); ++it ) { value += it.current()->reachableContacts( ); @@ -412,9 +412,9 @@ QStringList KIMProxy::reachableContacts() return value; } -QStringList KIMProxy::onlineContacts() +TQStringList KIMProxy::onlineContacts() { - QStringList value; + TQStringList value; PresenceStringMap::iterator it = d->presence_map.begin(); const PresenceStringMap::iterator end= d->presence_map.end(); for ( ; it != end; ++it ) @@ -424,13 +424,13 @@ QStringList KIMProxy::onlineContacts() return value; } -QStringList KIMProxy::fileTransferContacts() +TQStringList KIMProxy::fileTransferContacts() { - QStringList value; + TQStringList value; if ( initialize() ) { - QDictIterator<KIMIface_stub> it( m_im_client_stubs ); + TQDictIterator<KIMIface_stub> it( m_im_client_stubs ); for ( ; it.current(); ++it ) { value += it.current()->fileTransferContacts( ); @@ -439,14 +439,14 @@ QStringList KIMProxy::fileTransferContacts() return value; } -bool KIMProxy::isPresent( const QString& uid ) +bool KIMProxy::isPresent( const TQString& uid ) { return ( !d->presence_map[ uid ].isEmpty() ); } -QString KIMProxy::displayName( const QString& uid ) +TQString KIMProxy::displayName( const TQString& uid ) { - QString name; + TQString name; if ( initialize() ) { if ( KIMIface_stub* s = stubForUid( uid ) ) @@ -456,7 +456,7 @@ QString KIMProxy::displayName( const QString& uid ) return name; } -bool KIMProxy::canReceiveFiles( const QString & uid ) +bool KIMProxy::canReceiveFiles( const TQString & uid ) { if ( initialize() ) { @@ -466,7 +466,7 @@ bool KIMProxy::canReceiveFiles( const QString & uid ) return false; } -bool KIMProxy::canRespond( const QString & uid ) +bool KIMProxy::canRespond( const TQString & uid ) { if ( initialize() ) { @@ -476,17 +476,17 @@ bool KIMProxy::canRespond( const QString & uid ) return false; } -QString KIMProxy::context( const QString & uid ) +TQString KIMProxy::context( const TQString & uid ) { if ( initialize() ) { if ( KIMIface_stub* s = stubForUid( uid ) ) return s->context( uid ); } - return QString::null; + return TQString::null; } -void KIMProxy::chatWithContact( const QString& uid ) +void KIMProxy::chatWithContact( const TQString& uid ) { if ( initialize() ) { @@ -499,7 +499,7 @@ void KIMProxy::chatWithContact( const QString& uid ) return; } -void KIMProxy::messageContact( const QString& uid, const QString& message ) +void KIMProxy::messageContact( const TQString& uid, const TQString& message ) { if ( initialize() ) { @@ -512,11 +512,11 @@ void KIMProxy::messageContact( const QString& uid, const QString& message ) return; } -void KIMProxy::sendFile(const QString &uid, const KURL &sourceURL, const QString &altFileName, uint fileSize ) +void KIMProxy::sendFile(const TQString &uid, const KURL &sourceURL, const TQString &altFileName, uint fileSize ) { if ( initialize() ) { - QDictIterator<KIMIface_stub> it( m_im_client_stubs ); + TQDictIterator<KIMIface_stub> it( m_im_client_stubs ); for ( ; it.current(); ++it ) { if ( it.current()->canReceiveFiles( uid ) ) @@ -530,7 +530,7 @@ void KIMProxy::sendFile(const QString &uid, const KURL &sourceURL, const QString return; } -bool KIMProxy::addContact( const QString &contactId, const QString &protocol ) +bool KIMProxy::addContact( const TQString &contactId, const TQString &protocol ) { if ( initialize() ) { @@ -540,14 +540,14 @@ bool KIMProxy::addContact( const QString &contactId, const QString &protocol ) return false; } -QString KIMProxy::locate( const QString & contactId, const QString & protocol ) +TQString KIMProxy::locate( const TQString & contactId, const TQString & protocol ) { if ( initialize() ) { if ( KIMIface_stub* s = stubForProtocol( protocol ) ) return s->locate( contactId, protocol ); } - return QString::null; + return TQString::null; } bool KIMProxy::imAppsAvailable() @@ -557,15 +557,15 @@ bool KIMProxy::imAppsAvailable() bool KIMProxy::startPreferredApp() { - QString preferences = QString("[X-DCOP-ServiceName] = '%1'").arg( preferredApp() ); + TQString preferences = TQString("[X-DCOP-ServiceName] = '%1'").arg( preferredApp() ); // start/find an instance of DCOP/InstantMessenger - QString error; - QCString dcopService; + TQString error; + TQCString dcopService; // Get a preferred IM client. // The app will notify itself to us using registeredToDCOP, so we don't need to record a stub for it here // FIXME: error in preferences, see debug output - preferences = QString::null; - int result = KDCOPServiceStarter::self()->findServiceFor( IM_SERVICE_TYPE, QString::null, preferences, &error, &dcopService ); + preferences = TQString::null; + int result = KDCOPServiceStarter::self()->findServiceFor( IM_SERVICE_TYPE, TQString::null, preferences, &error, &dcopService ); kdDebug( 790 ) << k_funcinfo << "error was: " << error << ", dcopService: " << dcopService << endl; @@ -573,7 +573,7 @@ bool KIMProxy::startPreferredApp() } -void KIMProxy::pollAll( const QString &uid ) +void KIMProxy::pollAll( const TQString &uid ) { /* // We only need to call this function if we don't have any data at all // otherwise, the data will be kept fresh by received presence change @@ -582,7 +582,7 @@ void KIMProxy::pollAll( const QString &uid ) { AppPresence *presence = new AppPresence(); // record current presence from known clients - QDictIterator<KIMIface_stub> it( m_im_client_stubs ); + TQDictIterator<KIMIface_stub> it( m_im_client_stubs ); for ( ; it.current(); ++it ) { presence->insert( it.currentKey().ascii(), it.current()->presenceStatus( uid ) ); // m_im_client_stubs has qstring keys... @@ -591,13 +591,13 @@ void KIMProxy::pollAll( const QString &uid ) }*/ } -void KIMProxy::pollApp( const QCString & appId ) +void KIMProxy::pollApp( const TQCString & appId ) { //kdDebug( 790 ) << k_funcinfo << endl; KIMIface_stub * appStub = m_im_client_stubs[ appId ]; - QStringList contacts = m_im_client_stubs[ appId ]->allContacts(); - QStringList::iterator it = contacts.begin(); - QStringList::iterator end = contacts.end(); + TQStringList contacts = m_im_client_stubs[ appId ]->allContacts(); + TQStringList::iterator it = contacts.begin(); + TQStringList::iterator end = contacts.end(); for ( ; it != end; ++it ) { ContactPresenceListCurrent current = d->presence_map[ *it ]; @@ -613,7 +613,7 @@ void KIMProxy::pollApp( const QCString & appId ) } } -KIMIface_stub * KIMProxy::stubForUid( const QString &uid ) +KIMIface_stub * KIMProxy::stubForUid( const TQString &uid ) { // get best appPresence AppPresenceCurrent ap = d->presence_map[ uid ].best(); @@ -621,18 +621,18 @@ KIMIface_stub * KIMProxy::stubForUid( const QString &uid ) return m_im_client_stubs.find( ap.appId ); } -KIMIface_stub * KIMProxy::stubForProtocol( const QString &protocol) +KIMIface_stub * KIMProxy::stubForProtocol( const TQString &protocol) { KIMIface_stub * app; // see if the preferred client supports this protocol - QString preferred = preferredApp(); + TQString preferred = preferredApp(); if ( ( app = m_im_client_stubs.find( preferred ) ) ) { if ( app->protocols().grep( protocol ).count() > 0 ) return app; } // preferred doesn't do this protocol, try the first of the others that says it does - QDictIterator<KIMIface_stub> it( m_im_client_stubs ); + TQDictIterator<KIMIface_stub> it( m_im_client_stubs ); for ( ; it.current(); ++it ) { if ( it.current()->protocols().grep( protocol ).count() > 0 ) @@ -641,11 +641,11 @@ KIMIface_stub * KIMProxy::stubForProtocol( const QString &protocol) return 0L; } -QString KIMProxy::preferredApp() +TQString KIMProxy::preferredApp() { KConfig *store = new KSimpleConfig( IM_CLIENT_PREFERENCES_FILE ); store->setGroup( IM_CLIENT_PREFERENCES_SECTION ); - QString preferredApp = store->readEntry( IM_CLIENT_PREFERENCES_ENTRY ); + TQString preferredApp = store->readEntry( IM_CLIENT_PREFERENCES_ENTRY ); //kdDebug( 790 ) << k_funcinfo << "found preferred app: " << preferredApp << endl; return preferredApp; } diff --git a/interfaces/kimproxy/library/kimproxy.h b/interfaces/kimproxy/library/kimproxy.h index 6f56a0f13..d4312b341 100644 --- a/interfaces/kimproxy/library/kimproxy.h +++ b/interfaces/kimproxy/library/kimproxy.h @@ -24,10 +24,10 @@ #ifndef KIMPROXY_H #define KIMPROXY_H -#include <qdict.h> -#include <qmap.h> -#include <qptrdict.h> -#include <qstringlist.h> +#include <tqdict.h> +#include <tqmap.h> +#include <tqptrdict.h> +#include <tqstringlist.h> #define IM_SERVICE_TYPE "DCOP/InstantMessenger" @@ -43,10 +43,10 @@ class KURL; class ContactPresenceListCurrent; /** FIXME: remove for KDE4, binary compability again. */ -typedef QMap<QCString, int> AppPresence; // appId->presence; contains all applications' ideas of a user's presence -typedef QDict<AppPresence> PresenceMap; // uid->AppPresence; contains a AppPresences for all users +typedef TQMap<TQCString, int> AppPresence; // appId->presence; contains all applications' ideas of a user's presence +typedef TQDict<AppPresence> PresenceMap; // uid->AppPresence; contains a AppPresences for all users /** FIXME: remove presenceMap and call this presenceMap in KDE4. This hack is for binary compatibility */ -typedef QMap<QString, ContactPresenceListCurrent> PresenceStringMap; +typedef TQMap<TQString, ContactPresenceListCurrent> PresenceStringMap; /** * @brief Provides access to instant messenger programs which implement KDE's @@ -81,11 +81,11 @@ typedef QMap<QString, ContactPresenceListCurrent> PresenceStringMap; * // check if there are suitable applications reachable * if (!proxy->initialize()) return; * - * QString message = "Hi!\nHow are you on this wonderful day?"; + * TQString message = "Hi!\nHow are you on this wonderful day?"; * * // iterate over the list of reachable contacts - * QStringList reachableContacts = proxy->reachableContacts(); - * for (QStringList::const_iterator it = reachableContacts.begin(); + * TQStringList reachableContacts = proxy->reachableContacts(); + * for (TQStringList::const_iterator it = reachableContacts.begin(); * it != reachableContacts.end(); ++it) * { proxy->messageContact(*it, message); @@ -104,7 +104,7 @@ typedef QMap<QString, ContactPresenceListCurrent> PresenceStringMap; * @since 3.3 * @author Will Stephenson <lists@stevello.free-online.co.uk> */ -class KIMPROXY_EXPORT KIMProxy : public QObject, virtual public KIMProxyIface +class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface { Q_OBJECT struct Private; @@ -163,7 +163,7 @@ class KIMPROXY_EXPORT KIMProxy : public QObject, virtual public KIMProxyIface * @see isPresent() * @see KABC::Addressee::uid() */ - QStringList allContacts(); + TQStringList allContacts(); /** * @brief Obtain a list of IM-contacts that are currently reachable @@ -179,7 +179,7 @@ class KIMPROXY_EXPORT KIMProxy : public QObject, virtual public KIMProxyIface * @see messageContact() * @see KABC::Addressee::uid() */ - QStringList reachableContacts(); + TQStringList reachableContacts(); /** * @brief Obtain a list of IM-contacts that are currently online @@ -199,7 +199,7 @@ class KIMPROXY_EXPORT KIMProxy : public QObject, virtual public KIMProxyIface * @see chatWithContact() * @see KABC::Addressee::uid() */ - QStringList onlineContacts(); + TQStringList onlineContacts(); /** * @brief Obtain a list of IM-contacts who may receive file transfers @@ -221,7 +221,7 @@ class KIMPROXY_EXPORT KIMProxy : public QObject, virtual public KIMProxyIface * @see canReceiveFiles() * @see KABC::Addressee::uid() */ - QStringList fileTransferContacts(); + TQStringList fileTransferContacts(); /** * @brief Confirm if a given contact is known to the proxy @@ -241,7 +241,7 @@ class KIMPROXY_EXPORT KIMProxy : public QObject, virtual public KIMProxyIface * @see presenceNumeric() * @see KABC::Addressee::uid() */ - bool isPresent( const QString& uid ); + bool isPresent( const TQString& uid ); /** * @brief Obtain the proxy's idea of the contact's display name @@ -255,7 +255,7 @@ class KIMPROXY_EXPORT KIMProxy : public QObject, virtual public KIMProxyIface * Useful if KABC lookups may be too slow. * * @param uid the KABC UID you are interested in - * @return the corresponding display name or QString:null if the + * @return the corresponding display name or TQString:null if the * UID is unknown * * @see isPresent() @@ -263,7 +263,7 @@ class KIMPROXY_EXPORT KIMProxy : public QObject, virtual public KIMProxyIface * @see presenceNumeric() * @see KABC::Addressee::uid() */ - QString displayName( const QString& uid ); + TQString displayName( const TQString& uid ); /** * @brief Obtain the IM presence as a number for the specified contact @@ -304,7 +304,7 @@ class KIMPROXY_EXPORT KIMProxy : public QObject, virtual public KIMProxyIface * @see KIMIface::presenceStatus() * @see KABC::Addressee::uid() */ - int presenceNumeric( const QString& uid ); + int presenceNumeric( const TQString& uid ); /** * @brief Obtain the IM presence as a i18ned string for the specified @@ -333,14 +333,14 @@ class KIMPROXY_EXPORT KIMProxy : public QObject, virtual public KIMProxyIface * * @param uid the KABC UID you want the presence for * @return the i18ned string describing the contact's presence or - * QString::null if the UID is unknown + * TQString::null if the UID is unknown * * @see isPresent() * @see presenceNumeric() * @see presenceIcon() * @see KABC::Addressee::uid() */ - QString presenceString( const QString& uid ); + TQString presenceString( const TQString& uid ); /** * @brief Obtain the icon representing the IM presence for the @@ -362,14 +362,14 @@ class KIMPROXY_EXPORT KIMProxy : public QObject, virtual public KIMProxyIface * * @param uid the KABC UID you want the presence icon for * @return a pixmap representing the contact's presence or a null - * pixmap if the contact is unknown. See QPixmap::isNull() + * pixmap if the contact is unknown. See TQPixmap::isNull() * * @see isPresent() * @see presenceString() * @see presenceNumeric() * @see KABC::Addressee::uid() */ - QPixmap presenceIcon( const QString& uid ); + TQPixmap presenceIcon( const TQString& uid ); /** * @brief Indicate if a given contact can receive files @@ -386,7 +386,7 @@ class KIMPROXY_EXPORT KIMProxy : public QObject, virtual public KIMProxyIface * @see fileTransferContacts() * @see KABC::Addressee::uid() */ - bool canReceiveFiles( const QString & uid ); + bool canReceiveFiles( const TQString & uid ); /** * @brief Indicate if a given contact will be able to respond @@ -411,7 +411,7 @@ class KIMPROXY_EXPORT KIMProxy : public QObject, virtual public KIMProxyIface * @see isPresent() * @see KABC::Addressee::uid() */ - bool canRespond( const QString & uid ); + bool canRespond( const TQString & uid ); /** * @brief Obtain the KABC UID corresponding to the given IM address @@ -420,7 +420,7 @@ class KIMPROXY_EXPORT KIMProxy : public QObject, virtual public KIMProxyIface * e.g. UIN for ICQ, screenname for AIM, nick for IRC * @param protocol the IM protocol/service to check. * See KIMIface::protocols() - * @return the KABC UID for the given contact or @c QString::null if + * @return the KABC UID for the given contact or @c TQString::null if * not found or either input stream was empty or the protocol * is not supported * @@ -429,14 +429,14 @@ class KIMPROXY_EXPORT KIMProxy : public QObject, virtual public KIMProxyIface * @see isPresent() * @see KABC::Addressee::uid() */ - QString locate( const QString & contactId, const QString & protocol ); + TQString locate( const TQString & contactId, const TQString & protocol ); /** * @brief Obtain the given contact's current context (home, work, or * any) * * Not all IM services/protocols support the concept of contexts. If the - * given UID maps to such a service, @c QString::null will be returned + * given UID maps to such a service, @c TQString::null will be returned * * If the given KABC UID is known to more than one IM-application * the result of the application which has the best presence for the @@ -445,13 +445,13 @@ class KIMPROXY_EXPORT KIMProxy : public QObject, virtual public KIMProxyIface * value returned by the application providing ICQ is taken. * * @param uid the KABC UID you want the context for - * @return a string describing the context, or @c QString::null if not + * @return a string describing the context, or @c TQString::null if not * supported or if the contact is unknown * * @see isPresent() * @see KABC::Addressee::uid() */ - QString context( const QString & uid ); + TQString context( const TQString & uid ); /** * @brief Start a chat session with the specified contact @@ -464,7 +464,7 @@ class KIMPROXY_EXPORT KIMProxy : public QObject, virtual public KIMProxyIface * @see reachableContacts() * @see KABC::Addressee::uid() */ - void chatWithContact( const QString& uid ); + void chatWithContact( const TQString& uid ); /** * @brief Send a single message to the specified contact @@ -481,7 +481,7 @@ class KIMPROXY_EXPORT KIMProxy : public QObject, virtual public KIMProxyIface * @see reachableContacts() * @see KABC::Addressee::uid() */ - void messageContact( const QString& uid, const QString& message ); + void messageContact( const TQString& uid, const TQString& message ); /** * @brief Send a file to the contact @@ -500,8 +500,8 @@ class KIMPROXY_EXPORT KIMProxy : public QObject, virtual public KIMProxyIface * @see fileTransferContacts() * @see KABC::Addressee::uid() */ - void sendFile(const QString &uid, const KURL &sourceURL, - const QString &altFileName = QString::null, uint fileSize = 0); + void sendFile(const TQString &uid, const KURL &sourceURL, + const TQString &altFileName = TQString::null, uint fileSize = 0); /** * @brief Add a new contact given its protocol specific identifier @@ -516,7 +516,7 @@ class KIMPROXY_EXPORT KIMProxy : public QObject, virtual public KIMProxyIface * @see locate() * @see KIMIface::protocols() */ - bool addContact( const QString &contactId, const QString &protocol ); + bool addContact( const TQString &contactId, const TQString &protocol ); /** * @brief Checks if there are any compatible instant messaging @@ -542,7 +542,7 @@ class KIMPROXY_EXPORT KIMProxy : public QObject, virtual public KIMProxyIface /** * Just exists to let the IDL compiler make the DCOP signal for this */ - void contactPresenceChanged( QString uid, QCString appId, int presence ); + void contactPresenceChanged( TQString uid, TQCString appId, int presence ); public slots: /** @@ -557,7 +557,7 @@ class KIMPROXY_EXPORT KIMProxy : public QObject, virtual public KIMProxyIface * * @see DCOPClient::applicationRegistered() */ - void registeredToDCOP( const QCString& appId ); + void registeredToDCOP( const TQCString& appId ); /** * @brief Updates the proxy's data after an application unregistered @@ -576,7 +576,7 @@ class KIMPROXY_EXPORT KIMProxy : public QObject, virtual public KIMProxyIface * * @see DCOPClient::applicationRemoved() */ - void unregisteredFromDCOP( const QCString& appId ); + void unregisteredFromDCOP( const TQCString& appId ); signals: /** * @brief Indicates that the specified IM-contact's presence changed @@ -588,7 +588,7 @@ class KIMPROXY_EXPORT KIMProxy : public QObject, virtual public KIMProxyIface * @see presenceIcon() * @see KABC::Addressee::uid() */ - void sigContactPresenceChanged( const QString &uid ); + void sigContactPresenceChanged( const TQString &uid ); /** * @brief Indicates that presence information obtained earlier on might @@ -602,44 +602,44 @@ class KIMPROXY_EXPORT KIMProxy : public QObject, virtual public KIMProxyIface /** * Bootstrap our presence data for a newly registered app */ - void pollApp( const QCString & appId ); + void pollApp( const TQCString & appId ); /** * Bootstrap our presence data by polling all known apps */ - void pollAll( const QString &uid ); + void pollAll( const TQString &uid ); /** * Update our records with the given data */ - bool updatePresence( const QString &uid, const QCString &appId, int presence ); + bool updatePresence( const TQString &uid, const TQCString &appId, int presence ); /** * Get the name of the user's IM application of choice */ - QString preferredApp(); + TQString preferredApp(); /** * Get the app stub best able to reach this uid */ - KIMIface_stub * stubForUid( const QString &uid ); + KIMIface_stub * stubForUid( const TQString &uid ); /** * Get the app stub for this protocol. * Take the preferred app first, then any other. */ - KIMIface_stub * stubForProtocol( const QString &protocol ); + KIMIface_stub * stubForProtocol( const TQString &protocol ); private: // client stubs used to get presence // appId (from DCOP) -> KIMIface_stub - QDict<KIMIface_stub> m_im_client_stubs; + TQDict<KIMIface_stub> m_im_client_stubs; // map containing numeric presence and the originating application ID for each KABC uid we know of // KABC Uid -> (appId, numeric presence )(AppPresence) PresenceMap m_presence_map; // cache of the client strings in use by each application // dictionary of KIMIface_stub -> map of numeric presence -> string presence // FIXME: remove for KDE4 - UNUSED but maintained for binary compatibility in KDE 3.4 - QPtrDict<int> m_client_presence_strings; + TQPtrDict<int> m_client_presence_strings; Private * d; bool m_apps_available; bool m_initialized; diff --git a/interfaces/kimproxy/library/kimproxyiface.h b/interfaces/kimproxy/library/kimproxyiface.h index 7c99bce4e..fa11183c9 100644 --- a/interfaces/kimproxy/library/kimproxyiface.h +++ b/interfaces/kimproxy/library/kimproxyiface.h @@ -32,7 +32,7 @@ class KIMProxyIface : virtual public DCOPObject { K_DCOP k_dcop: - virtual void contactPresenceChanged( QString uid, QCString appId, int presence ) = 0; + virtual void contactPresenceChanged( TQString uid, TQCString appId, int presence ) = 0; }; #endif diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp index 5db8f65d0..11fa58f27 100644 --- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp +++ b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp @@ -1,9 +1,9 @@ #include "kfileaudiopreview.h" -#include <qcheckbox.h> -#include <qhbox.h> -#include <qlayout.h> -#include <qvgroupbox.h> +#include <tqcheckbox.h> +#include <tqhbox.h> +#include <tqlayout.h> +#include <tqvgroupbox.h> #include <kglobal.h> #include <kconfig.h> @@ -20,12 +20,12 @@ class KFileAudioPreviewFactory : public KLibFactory { protected: - virtual QObject *createObject( QObject *parent, const char *name, - const char *className, const QStringList & args) + virtual TQObject *createObject( TQObject *parent, const char *name, + const char *className, const TQStringList & args) { Q_UNUSED(className); Q_UNUSED(args); - return new KFileAudioPreview( dynamic_cast<QWidget*>( parent ), name ); + return new KFileAudioPreview( dynamic_cast<TQWidget*>( parent ), name ); } }; @@ -39,9 +39,9 @@ K_EXPORT_COMPONENT_FACTORY( kfileaudiopreview, KFileAudioPreviewFactory ) class KFileAudioPreview::KFileAudioPreviewPrivate { public: - KFileAudioPreviewPrivate( QWidget *parent ) + KFileAudioPreviewPrivate( TQWidget *parent ) { - player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", QString::null, parent ); + player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", TQString::null, parent ); } ~KFileAudioPreviewPrivate() @@ -53,22 +53,22 @@ public: }; -KFileAudioPreview::KFileAudioPreview( QWidget *parent, const char *name ) +KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name ) : KPreviewWidgetBase( parent, name ) { KGlobal::locale()->insertCatalogue("kfileaudiopreview"); - QStringList formats = KDE::PlayObjectFactory::mimeTypes(); + TQStringList formats = KDE::PlayObjectFactory::mimeTypes(); // ### - QStringList::ConstIterator it = formats.begin(); + TQStringList::ConstIterator it = formats.begin(); for ( ; it != formats.end(); ++it ) m_supportedFormats.insert( *it, (void*) 1 ); - QVGroupBox *box = new QVGroupBox( i18n("Media Player"), this ); - QVBoxLayout *layout = new QVBoxLayout( this ); + TQVGroupBox *box = new TQVGroupBox( i18n("Media Player"), this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); layout->addWidget( box ); - (void) new QWidget( box ); // spacer + (void) new TQWidget( box ); // spacer d = new KFileAudioPreviewPrivate( 0L ); // not box -- being reparented anyway if ( d->player ) // only if there actually is a component... @@ -81,19 +81,19 @@ KFileAudioPreview::KFileAudioPreview( QWidget *parent, const char *name ) // So, reparent first the video widget, then the view. if ( view->videoWidget() ) { - QHBox *frame = new QHBox( box ); - frame->setFrameStyle( QFrame::Panel | QFrame::Sunken ); - frame->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); - view->videoWidget()->reparent( frame, QPoint(0,0) ); + TQHBox *frame = new TQHBox( box ); + frame->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); + frame->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + view->videoWidget()->reparent( frame, TQPoint(0,0) ); } - view->reparent( box, QPoint(0,0) ); + view->reparent( box, TQPoint(0,0) ); } - m_autoPlay = new QCheckBox( i18n("Play &automatically"), box ); + m_autoPlay = new TQCheckBox( i18n("Play &automatically"), box ); KConfigGroup config( KGlobal::config(), ConfigGroup ); m_autoPlay->setChecked( config.readBoolEntry( "Autoplay sounds", true ) ); - connect( m_autoPlay, SIGNAL(toggled(bool)), SLOT(toggleAuto(bool)) ); + connect( m_autoPlay, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleAuto(bool)) ); } KFileAudioPreview::~KFileAudioPreview() diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.h b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.h index df1d19e5b..db921c7e1 100644 --- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.h +++ b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.h @@ -19,7 +19,7 @@ #ifndef KFILEAUDIOPREVIEW_H #define KFILEAUDIOPREVIEW_H -#include <qdict.h> +#include <tqdict.h> #include <kurl.h> #include <kpreviewwidgetbase.h> @@ -39,7 +39,7 @@ class KFileAudioPreview : public KPreviewWidgetBase Q_OBJECT public: - KFileAudioPreview(QWidget *parent = 0, const char *name = 0 ); + KFileAudioPreview(TQWidget *parent = 0, const char *name = 0 ); ~KFileAudioPreview(); public slots: @@ -50,9 +50,9 @@ private slots: void toggleAuto(bool); private: - QDict<void> m_supportedFormats; + TQDict<void> m_supportedFormats; KURL m_currentURL; - QCheckBox *m_autoPlay; + TQCheckBox *m_autoPlay; protected: virtual void virtual_hook( int id, void* data ); diff --git a/interfaces/kmediaplayer/player.cpp b/interfaces/kmediaplayer/player.cpp index cbfba1368..681459731 100644 --- a/interfaces/kmediaplayer/player.cpp +++ b/interfaces/kmediaplayer/player.cpp @@ -28,7 +28,7 @@ KMediaPlayer::PlayerDCOPObject::PlayerDCOPObject(void) { } -KMediaPlayer::Player::Player(QWidget *, const char *, QObject *parent, const char *name) +KMediaPlayer::Player::Player(TQWidget *, const char *, TQObject *parent, const char *name) : KParts::ReadOnlyPart(parent, name) , currentLooping(false) , currentState(Empty) @@ -36,7 +36,7 @@ KMediaPlayer::Player::Player(QWidget *, const char *, QObject *parent, const cha { } -KMediaPlayer::Player::Player(QObject *parent, const char *name) +KMediaPlayer::Player::Player(TQObject *parent, const char *name) : KParts::ReadOnlyPart(parent, name) , currentLooping(false) , currentState(Empty) diff --git a/interfaces/kmediaplayer/player.h b/interfaces/kmediaplayer/player.h index 89a4a0b23..10e9f4a74 100644 --- a/interfaces/kmediaplayer/player.h +++ b/interfaces/kmediaplayer/player.h @@ -51,12 +51,12 @@ public: /** This constructor is what to use when no GUI is required, as in the * case of a KMediaPlayer/Engine. */ - Player(QObject *parent, const char *name); + Player(TQObject *parent, const char *name); /** This constructor is what to use when a GUI is required, as in the * case of a KMediaPlayer/Player. */ - Player(QWidget *parentWidget, const char *widgetName, QObject *parent, const char *name); + Player(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name); virtual ~Player(void); diff --git a/interfaces/kmediaplayer/view.cpp b/interfaces/kmediaplayer/view.cpp index c231d8aaf..64e3bf484 100644 --- a/interfaces/kmediaplayer/view.cpp +++ b/interfaces/kmediaplayer/view.cpp @@ -27,11 +27,11 @@ struct KMediaPlayer::View::Data { Data() : videoWidget(0L) {} - QWidget *videoWidget; + TQWidget *videoWidget; }; -KMediaPlayer::View::View(QWidget *parent, const char *name) - : QWidget(parent, name) +KMediaPlayer::View::View(TQWidget *parent, const char *name) + : TQWidget(parent, name) , currentButtons((int)All) , d(new Data()) { @@ -76,12 +76,12 @@ void KMediaPlayer::View::toggleButton(int b) setButtons(currentButtons ^ b); } -void KMediaPlayer::View::setVideoWidget(QWidget *videoWidget) +void KMediaPlayer::View::setVideoWidget(TQWidget *videoWidget) { d->videoWidget = videoWidget; } -QWidget* KMediaPlayer::View::videoWidget() +TQWidget* KMediaPlayer::View::videoWidget() { return d->videoWidget; } diff --git a/interfaces/kmediaplayer/view.h b/interfaces/kmediaplayer/view.h index be60f9e75..54f46a8ca 100644 --- a/interfaces/kmediaplayer/view.h +++ b/interfaces/kmediaplayer/view.h @@ -24,7 +24,7 @@ #ifndef KMEDIAPLAYERVIEW_H #define KMEDIAPLAYERVIEW_H -#include <qwidget.h> +#include <tqwidget.h> #include <kdelibs_export.h> namespace KMediaPlayer @@ -36,8 +36,8 @@ class KDE_EXPORT View : public QWidget Q_OBJECT public: - /** Your typical QWidget constructor. */ - View(QWidget *parent, const char *name); + /** Your typical TQWidget constructor. */ + View(TQWidget *parent, const char *name); virtual ~View(void); /** The Possible buttons that can appear in the UI. */ @@ -58,9 +58,9 @@ public: /** Return which buttons are being displayed. */ int buttons(void); - /** Return the QWidget in which video is displayed. + /** Return the TQWidget in which video is displayed. May Return 0L if there is none. */ - QWidget *videoWidget(); + TQWidget *videoWidget(); public slots: /** Set which buttons to display. See Button. */ @@ -84,7 +84,7 @@ protected: the video will be displayed. KMediaPlayer users may reparent() it to somewhere else, for example. */ - void setVideoWidget(QWidget *videoWidget); + void setVideoWidget(TQWidget *videoWidget); private: int currentButtons; diff --git a/interfaces/kregexpeditor/kregexpeditorinterface.h b/interfaces/kregexpeditor/kregexpeditorinterface.h index f1267d711..01fab0fdf 100644 --- a/interfaces/kregexpeditor/kregexpeditorinterface.h +++ b/interfaces/kregexpeditor/kregexpeditorinterface.h @@ -1,7 +1,7 @@ #ifndef __kregexpeditorinterface_h__ #define __kregexpeditorinterface_h__ -#include <qstring.h> +#include <tqstring.h> /** * A graphical editor for regular expressions. @@ -22,7 +22,7 @@ * regular expression dialog: * * \code - * QDialog *editorDialog = KParts::ComponentFactory::createInstanceFromQuery<QDialog>( "KRegExpEditor/KRegExpEditor" ); + * TQDialog *editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor" ); * if ( editorDialog ) { * // kdeutils was installed, so the dialog was found fetch the editor interface * KRegExpEditorInterface *editor = static_cast<KRegExpEditorInterface *>( editorDialog->qt_cast( "KRegExpEditorInterface" ) ); @@ -41,16 +41,16 @@ * * Note: signals and slots must be connected to the editorDialog object, not to the editor object: * \code - * connect( editorDialog, SIGNAL( canUndo( bool ) ), undoBut, SLOT( setEnabled( bool ) ) ); + * connect( editorDialog, TQT_SIGNAL( canUndo( bool ) ), undoBut, TQT_SLOT( setEnabled( bool ) ) ); * \endcode * * If you want to create an instance of the editor widget, i.e. not the * dialog, then you must do it in the following way: * * \code - * QWidget *editorWidget = - * KParts::ComponentFactory::createInstanceFromQuery<QWidget>( - * "KRegExpEditor/KRegExpEditor", QString::null, parent ); + * TQWidget *editorWidget = + * KParts::ComponentFactory::createInstanceFromQuery<TQWidget>( + * "KRegExpEditor/KRegExpEditor", TQString::null, parent ); * if ( editorWidget ) { * // kdeutils was installed, so the widget was found fetch the editor interface * KRegExpEditorInterface *editor = static_cast<KRegExpEditorInterface *>( editorWidget->qt_cast( "KRegExpEditorInterface" ) ); @@ -75,7 +75,7 @@ public: * returns the regular expression of the editor in Qt3 QRegExp * syntax. Note, there is also a 'regexp' Qt property available. */ - virtual QString regExp() const = 0; + virtual TQString regExp() const = 0; protected: // These are signals: in classes that actually implement the interface. @@ -103,9 +103,9 @@ public: /** * Set the regular expression for the editor. The syntax must be Qt3 - * QRegExp syntax. + * TQRegExp syntax. */ - virtual void setRegExp( const QString ®exp ) = 0; + virtual void setRegExp( const TQString ®exp ) = 0; virtual void redo() = 0; virtual void undo() = 0; @@ -116,7 +116,7 @@ public: * this method will be used to give the widget a text to show matches of * the regular expression on. */ - virtual void setMatchText( const QString& ) = 0; + virtual void setMatchText( const TQString& ) = 0; /** * This method allows for future changes that will not break binary @@ -130,7 +130,7 @@ public: * * Conclusion: You should not use this method in this version of KDE! */ - virtual void doSomething( QString method, void* arguments ) = 0; + virtual void doSomething( TQString method, void* arguments ) = 0; }; #endif diff --git a/interfaces/kscript/sample/shellscript.cpp b/interfaces/kscript/sample/shellscript.cpp index 4e3062eb2..49aee0727 100644 --- a/interfaces/kscript/sample/shellscript.cpp +++ b/interfaces/kscript/sample/shellscript.cpp @@ -28,12 +28,12 @@ typedef KGenericFactory<ShellScript, KScriptClientInterface> ShellScriptFactory; K_EXPORT_COMPONENT_FACTORY( libshellscript, ShellScriptFactory( "ShellScript" ) ) -ShellScript::ShellScript(KScriptClientInterface *parent, const char *, const QStringList & ) : ScriptClientInterface(parent) +ShellScript::ShellScript(KScriptClientInterface *parent, const char *, const TQStringList & ) : ScriptClientInterface(parent) { m_script = new KProcess(); - connect ( m_script, SIGNAL(processExited(KProcess *)), SLOT(Exit(KProcess *))); - connect ( m_script, SIGNAL(receivedStdout(KProcess *, char *, int)), SLOT(stdOut(KProcess *, char *, int ))); - connect ( m_script, SIGNAL(receivedStderr(KProcess *, char *, int)), SLOT(stdErr(KProcess *, char *, int ))); + connect ( m_script, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(Exit(KProcess *))); + connect ( m_script, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), TQT_SLOT(stdOut(KProcess *, char *, int ))); + connect ( m_script, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), TQT_SLOT(stdErr(KProcess *, char *, int ))); // Connect feedback signals and slots //kdDebug() << "Building new script engine" << endl; } @@ -42,23 +42,23 @@ ShellScript::~ShellScript() { } -QString ShellScript::script() const +TQString ShellScript::script() const { return m_scriptName; } -void ShellScript::setScript( const QString &scriptFile ) +void ShellScript::setScript( const TQString &scriptFile ) { m_scriptName = scriptFile; *m_script << "sh" << m_scriptName << kapp->dcopClient()->appId(); } -void ShellScript::setScript( const QString &, const QString & ) +void ShellScript::setScript( const TQString &, const TQString & ) { // ### what is this? } -void ShellScript::run(QObject *, const QVariant &) +void ShellScript::run(TQObject *, const TQVariant &) { m_script->start(KProcess::NotifyOnExit,KProcess::All); } diff --git a/interfaces/kscript/sample/shellscript.h b/interfaces/kscript/sample/shellscript.h index c6bdc3c38..853a7bd12 100644 --- a/interfaces/kscript/sample/shellscript.h +++ b/interfaces/kscript/sample/shellscript.h @@ -20,20 +20,20 @@ #define __shellscript_h__ #include <scriptinterface.h> -#include <qvariant.h> -#include <qobject.h> +#include <tqvariant.h> +#include <tqobject.h> #include <kprocess.h> //using namespace KScriptInterface; class ShellScript : public KScriptInterface { Q_OBJECT public: - ShellScript(KScriptClientInterface *parent, const char *name, const QStringList &args); + ShellScript(KScriptClientInterface *parent, const char *name, const TQStringList &args); virtual ~ShellScript(); - QString script() const; - void setScript( const QString &scriptFile ); - void setScript( const QString &scriptLibFile, const QString &method ); - void run(QObject *context = 0, const QVariant &arg = 0); + TQString script() const; + void setScript( const TQString &scriptFile ); + void setScript( const TQString &scriptLibFile, const TQString &method ); + void run(TQObject *context = 0, const TQVariant &arg = 0); void kill(); private slots: void Exit(KProcess *proc); @@ -42,7 +42,7 @@ private slots: private: KProcess *m_script; KScriptClientInterface *ScriptClientInterface; - QString m_scriptName; + TQString m_scriptName; }; #endif diff --git a/interfaces/kscript/scriptclientinterface.h b/interfaces/kscript/scriptclientinterface.h index adeaa6424..ae5672a35 100644 --- a/interfaces/kscript/scriptclientinterface.h +++ b/interfaces/kscript/scriptclientinterface.h @@ -18,7 +18,7 @@ */ #ifndef __scriptclientinterface_h__ #define __scriptclientinterface_h__ -#include <qvariant.h> +#include <tqvariant.h> class QString; @@ -32,11 +32,11 @@ class QString; * There are currently a few implementations of script managers around but developers can implement their own custom * interfaces with this class. * @code - * class MyScript : public QObject, public KScriptClientInterface { + * class MyScript : public TQObject, public KScriptClientInterface { * Q_OBJECT * public: * - * MyScript(QObject *parent) + * MyScript(TQObject *parent) * { * // Create your @ref KScriptInterface here. * m_interface = KParts::ComponentFactory::createInstanceFromQuery<KScriptInterface>( @@ -49,14 +49,14 @@ class QString; * } * * signals: - * void error ( const QString &msg ); - * void warning ( const QString &msg ); - * void output ( const QString &msg ); + * void error ( const TQString &msg ); + * void warning ( const TQString &msg ); + * void output ( const TQString &msg ); * void progress ( int percent ); - * void done ( KScriptClientInterface::Result result, const QVariant &returned ); + * void done ( KScriptClientInterface::Result result, const TQVariant &returned ); * * public slots: - * void activate(const QVariant &args) + * void activate(const TQVariant &args) * { * m_interface->run(parent(), args); * } @@ -80,21 +80,21 @@ class QString; * For script clients its best to implement this as a signal so feedback * can be sent to the main application. */ - virtual void error( const QString &msg ) =0; + virtual void error( const TQString &msg ) =0; /** * This function will allow the main application of any warnings * that have occurred during the processing of the script. * For script clients its best to implement this as a signal so feedback * can be sent to the main application. */ - virtual void warning( const QString &msg ) =0; + virtual void warning( const TQString &msg ) =0; /** * This function will allow the main application of any normal * output that has occurred during the processing of the script. * For script clients its best to implement this as a signal so feedback * can be sent to the main application. */ - virtual void output( const QString &msg ) =0; + virtual void output( const TQString &msg ) =0; /** * This function will allow feedback to any progress bars in the main * application as to how far along the script is. This is very useful when @@ -111,7 +111,7 @@ class QString; * For script clients its best to implement this as a signal so feedback * can be sent to the main application. */ - virtual void done( KScriptClientInterface::Result result, const QVariant &returned ) =0; + virtual void done( KScriptClientInterface::Result result, const TQVariant &returned ) =0; /** * Returned when the script has finished running. * For script clients its best to implement this as a signal so feedback diff --git a/interfaces/kscript/scriptinterface.h b/interfaces/kscript/scriptinterface.h index de387ecc6..9ca3a45bd 100644 --- a/interfaces/kscript/scriptinterface.h +++ b/interfaces/kscript/scriptinterface.h @@ -27,8 +27,8 @@ **/ #ifndef __scriptinterface_h__ #define __scriptinterface_h__ -#include <qvariant.h> -#include <qobject.h> +#include <tqvariant.h> +#include <tqobject.h> #include <kdemacros.h> //#include <scripclientinterface.h> @@ -50,25 +50,25 @@ class KScriptClientInterface; public: /** * Return the current script code data - * @returns QString containing the currenly runable code + * @returns TQString containing the currenly runable code **/ - virtual QString script() const = 0; + virtual TQString script() const = 0; /** * Sets the path to the script library that we are going to embed. **/ - virtual void setScript( const QString &scriptFile ) = 0; + virtual void setScript( const TQString &scriptFile ) = 0; /** * Sets the path to the script library that we are going to embed. * The second argument is the function from the script library that * we wish to call. **/ - virtual void setScript( const QString &scriptLibFile, const QString &method ) = 0; + virtual void setScript( const TQString &scriptLibFile, const TQString &method ) = 0; /** * Run the actual script code * This can both take a context object that will be shared between the * main application and a variant that will contain the arguments. **/ - virtual void run(QObject *context = 0, const QVariant &arg = 0) = 0; + virtual void run(TQObject *context = 0, const TQVariant &arg = 0) = 0; /** * Abort the scripts run **/ diff --git a/interfaces/kscript/scriptloader.cpp b/interfaces/kscript/scriptloader.cpp index 6ab7e091c..621ceb5d1 100644 --- a/interfaces/kscript/scriptloader.cpp +++ b/interfaces/kscript/scriptloader.cpp @@ -29,18 +29,18 @@ #include <kstdaccel.h> #include <kdebug.h> -#include <qdir.h> -#include <qfileinfo.h> +#include <tqdir.h> +#include <tqfileinfo.h> -ScriptLoader::ScriptLoader(KMainWindow *parent) : QObject (parent) +ScriptLoader::ScriptLoader(KMainWindow *parent) : TQObject (parent) { m_parent = parent; m_scripts.clear(); m_theAction = new KSelectAction ( i18n("KDE Scripts"), 0, this, - SLOT(runAction()), + TQT_SLOT(runAction()), m_parent->actionCollection(), "scripts"); } @@ -54,15 +54,15 @@ ScriptLoader::~ScriptLoader() KSelectAction * ScriptLoader::getScripts() { // Get the available scripts for this application. - QStringList pluginList = ""; + TQStringList pluginList = ""; // Find plugins - QString searchPath = kapp->name(); + TQString searchPath = kapp->name(); searchPath += "/scripts/"; - QDir d(locate( "data", searchPath)); + TQDir d(locate( "data", searchPath)); kdDebug() << "loading plugin from " << locate( "data", searchPath) << endl; const QFileInfoList *fileList = d.entryInfoList("*.desktop"); QFileInfoListIterator it ( *fileList ); - QFileInfo *fi; + TQFileInfo *fi; // Find all available script desktop files while( (fi=it.current())) { @@ -92,7 +92,7 @@ KSelectAction * ScriptLoader::getScripts() void ScriptLoader::runAction() { - QString scriptName = m_theAction->currentText(); + TQString scriptName = m_theAction->currentText(); } diff --git a/interfaces/kscript/scriptloader.h b/interfaces/kscript/scriptloader.h index c6b2848de..20b135231 100644 --- a/interfaces/kscript/scriptloader.h +++ b/interfaces/kscript/scriptloader.h @@ -18,7 +18,7 @@ */ #ifndef _script_loader_h #define _script_loader_h -#include <qptrlist.h> +#include <tqptrlist.h> #include <kmainwindow.h> #include <kaction.h> #include <kscript/scriptinterface.h> @@ -47,11 +47,11 @@ class ScriptLoader : virtual public QObject */ void stopAction(); signals: - virtual void errors(QString messages); - virtual void output(QString messages); + virtual void errors(TQString messages); + virtual void output(TQString messages); virtual void done(int errorCode); private: - QPtrList<KScriptInterface> m_scripts; + TQPtrList<KScriptInterface> m_scripts; KSelectAction *m_theAction; int m_currentSelection; KMainWindow *m_parent; diff --git a/interfaces/kscript/scriptmanager.cpp b/interfaces/kscript/scriptmanager.cpp index 48592e2cf..5cdbd7459 100644 --- a/interfaces/kscript/scriptmanager.cpp +++ b/interfaces/kscript/scriptmanager.cpp @@ -13,9 +13,9 @@ class ScriptInfo { public: - QString scriptType; - QString scriptFile; - QString scriptMethod; + TQString scriptType; + TQString scriptFile; + TQString scriptMethod; ScriptInfo(); ~ScriptInfo(){} }; @@ -25,8 +25,8 @@ ScriptInfo::ScriptInfo() scriptFile = ""; scriptMethod = ""; } -KScriptManager::KScriptManager(QObject *parent, const char *name) : - QObject(parent,name), KScriptClientInterface() +KScriptManager::KScriptManager(TQObject *parent, const char *name) : + TQObject(parent,name), KScriptClientInterface() { } @@ -36,14 +36,14 @@ KScriptManager::~KScriptManager() m_scriptCache.setAutoDelete(true); } -bool KScriptManager::addScript( const QString &scriptDesktopFile) +bool KScriptManager::addScript( const TQString &scriptDesktopFile) { //m_scriptNames.append(scriptName); // lets get some information about the script we are going to run... bool success = false; - QString tmpScriptType = ""; - QString tmpScriptFile = ""; - QString tmpScriptMethod = ""; + TQString tmpScriptType = ""; + TQString tmpScriptFile = ""; + TQString tmpScriptMethod = ""; // Read the desktop file if(KDesktopFile::isDesktopFile(scriptDesktopFile)) @@ -51,24 +51,24 @@ bool KScriptManager::addScript( const QString &scriptDesktopFile) KDesktopFile desktop(scriptDesktopFile, true); m_scripts.insert(desktop.readName(), new ScriptInfo()); m_scripts[desktop.readName()]->scriptType = desktop.readType(); - QString localpath = QString(kapp->name()) + "/scripts/" + desktop.readEntry("X-KDE-ScriptName", ""); + TQString localpath = TQString(kapp->name()) + "/scripts/" + desktop.readEntry("X-KDE-ScriptName", ""); m_scripts[desktop.readName()]->scriptFile = locate("data", localpath); // m_scripts[desktop.readName()]->scriptMethod = tmpScriptMethod; success = true; } return success; } -bool KScriptManager::removeScript( const QString &scriptName ) +bool KScriptManager::removeScript( const TQString &scriptName ) { bool result = m_scriptCache.remove(scriptName); result = m_scripts.remove(scriptName); return result; } -QStringList KScriptManager::scripts() +TQStringList KScriptManager::scripts() { - QDictIterator<ScriptInfo> it( m_scripts ); + TQDictIterator<ScriptInfo> it( m_scripts ); // return m_scriptNames; - QStringList scriptList; + TQStringList scriptList; while ( it.current() ) { scriptList.append(it.currentKey()); @@ -81,19 +81,19 @@ void KScriptManager::clear() m_scriptCache.clear(); m_scripts.clear(); } -void KScriptManager::runScript( const QString &scriptName, QObject *context, const QVariant &arg) +void KScriptManager::runScript( const TQString &scriptName, TQObject *context, const TQVariant &arg) { ScriptInfo *newScript = m_scripts[scriptName]; if (newScript) { - QString scriptType = "([X-KDE-Script-Runner] == '" + newScript->scriptType + "')"; + TQString scriptType = "([X-KDE-Script-Runner] == '" + newScript->scriptType + "')"; kdDebug()<<"running script, type = '"<<scriptType<<"'"<<endl; // See if the script is already cached... if ( !m_scriptCache[scriptName] ) { // via some magic we will let the old script engine go away after // some minutes... - // currently i am thinking a QTimer that will throw a signal in 10 minutes + // currently i am thinking a TQTimer that will throw a signal in 10 minutes // to remove m_scriptCache[m_currentScript] KScriptInterface *ksif = KParts::ComponentFactory::createInstanceFromQuery<KScriptInterface>( "KScriptRunner/KScriptRunner", scriptType, this ); if ( ksif ) diff --git a/interfaces/kscript/scriptmanager.h b/interfaces/kscript/scriptmanager.h index 8ace6dcff..77a447c44 100644 --- a/interfaces/kscript/scriptmanager.h +++ b/interfaces/kscript/scriptmanager.h @@ -19,11 +19,11 @@ #ifndef __scriptmanager_h__ #define __scriptmanager_h__ -#include <qvariant.h> +#include <tqvariant.h> #include <scriptclientinterface.h> #include <scriptinterface.h> -#include <qdict.h> -#include <qobject.h> +#include <tqdict.h> +#include <tqobject.h> #include <kdelibs_export.h> @@ -36,7 +36,7 @@ class ScriptInfo; * @author Ian Reinhart Geiser <geiseri@kde.org> * **/ - class KDE_EXPORT KScriptManager : public QObject, public KScriptClientInterface + class KDE_EXPORT KScriptManager : public TQObject, public KScriptClientInterface { Q_OBJECT friend class KScriptInterface; @@ -44,7 +44,7 @@ class ScriptInfo; /** * Create a new instance of the script engine. */ - KScriptManager(QObject *parent, const char *name); + KScriptManager(TQObject *parent, const char *name); /** * Destroy the current script engine. */ @@ -54,17 +54,17 @@ class ScriptInfo; * This should be the full name and path to the desktop * file. */ - bool addScript( const QString &scriptDesktopFile); + bool addScript( const TQString &scriptDesktopFile); /** * Remove a script instance from the script engine. * @returns the success of the operation. */ - bool removeScript( const QString &scriptName ); + bool removeScript( const TQString &scriptName ); /** * Access the names of script instances from the script engine. - * @returns a QStringList of the current scripts. + * @returns a TQStringList of the current scripts. */ - QStringList scripts(); + TQStringList scripts(); /** * Clear all script intstances in memory */ @@ -73,17 +73,17 @@ class ScriptInfo; * This function will allow the main application of any errors * that have occurred during processing of the script. */ - void error( const QString &msg ) {emit scriptError(msg);} + void error( const TQString &msg ) {emit scriptError(msg);} /** * This function will allow the main application of any warnings * that have occurred during the processing of the script. */ - void warning( const QString &msg ) {emit scriptWarning(msg);} + void warning( const TQString &msg ) {emit scriptWarning(msg);} /** * This function will allow the main application of any normal * output that has occurred during the processing of the script. */ - void output( const QString &msg ) {emit scriptOutput(msg);} + void output( const TQString &msg ) {emit scriptOutput(msg);} /** * This function will allow feedback to any progress bars in the main * application as to how far along the script is. This is very useful when @@ -96,29 +96,29 @@ class ScriptInfo; * It turns the result as a KScriptInteface::Result, and a return * value as a QVariant */ - void done( KScriptClientInterface::Result result, const QVariant &returned ) {emit scriptDone(result, returned);} + void done( KScriptClientInterface::Result result, const TQVariant &returned ) {emit scriptDone(result, returned);} public slots: /** * Run the selected script */ - void runScript( const QString &scriptName, QObject *context = 0, const QVariant &arg = 0 ); + void runScript( const TQString &scriptName, TQObject *context = 0, const TQVariant &arg = 0 ); signals: /** * Send out a signal of the error message from the current running * script. */ - void scriptError( const QString &msg ); + void scriptError( const TQString &msg ); /** * Send out a signal of the warning message from the current running * script. */ - void scriptWarning( const QString &msg ); + void scriptWarning( const TQString &msg ); /** * Send out a signal of the output message from the current running * script. */ - void scriptOutput( const QString &msg ); + void scriptOutput( const TQString &msg ); /** * Send out a signal of the progress of the current running * script. @@ -128,12 +128,12 @@ class ScriptInfo; * Send out a signal of the exit status of the script * */ - void scriptDone( KScriptClientInterface::Result result, const QVariant &returned); + void scriptDone( KScriptClientInterface::Result result, const TQVariant &returned); protected: - QDict<ScriptInfo> m_scripts; - QDict<KScriptInterface> m_scriptCache; - //QStringList m_scriptNames; - QString m_currentScript; + TQDict<ScriptInfo> m_scripts; + TQDict<KScriptInterface> m_scriptCache; + //TQStringList m_scriptNames; + TQString m_currentScript; }; //}; #endif diff --git a/interfaces/kspeech/kspeech.h b/interfaces/kspeech/kspeech.h index b97314760..049afbfa2 100644 --- a/interfaces/kspeech/kspeech.h +++ b/interfaces/kspeech/kspeech.h @@ -22,7 +22,7 @@ #define _KSPEECH_H_ #include <dcopobject.h> -#include <qstringlist.h> +#include <tqstringlist.h> /** * @interface KSpeech @@ -207,7 +207,7 @@ * "kttsd", object "KSpeech". * @verbatim - MyPart::MyPart(QWidget *parent, const char *name) : + MyPart::MyPart(TQWidget *parent, const char *name) : KParts::ReadOnlyPart(parent, name), DCOPStub("kttsd", "KSpeech") { @endverbatim @@ -218,8 +218,8 @@ DCOPClient *client = dcopClient(); client->attach(); if (!client->isApplicationRegistered("kttsd")) { - QString error; - if (KApplication::startServiceByDesktopName("kttsd", QStringList(), &error)) + TQString error; + if (KApplication::startServiceByDesktopName("kttsd", TQStringList(), &error)) cout << "Starting KTTSD failed with message " << error << endl; } @endverbatim @@ -271,7 +271,7 @@ virtual public KSpeechSink { protected: - ASYNC sentenceStarted(const QCString& appId, const uint jobNum, const uint seq); + ASYNC sentenceStarted(const TQCString& appId, const uint jobNum, const uint seq); @endverbatim * * You can combine sending and receiving in one object. @@ -284,7 +284,7 @@ virtual public KSpeechSink { protected: - ASYNC sentenceStarted(const QCString& appId, const uint jobNum, const uint seq); + ASYNC sentenceStarted(const TQCString& appId, const uint jobNum, const uint seq); @endverbatim * * See below for the signals you can declare. @@ -293,7 +293,7 @@ * receiving object. * @verbatim - MyPart::MyPart(QWidget *parent, const char *name) : + MyPart::MyPart(TQWidget *parent, const char *name) : KParts::ReadOnlyPart(parent, name), DCOPObject("mypart_kspeechsink") { @endverbatim @@ -314,8 +314,8 @@ } // Connect KTTSD DCOP signals to our slots. connectDCOPSignal("kttsd", "KSpeech", - "sentenceStarted(QCString,uint,uint)", - "sentenceStarted(QCString,uint,uint)", + "sentenceStarted(TQCString,uint,uint)", + "sentenceStarted(TQCString,uint,uint)", false); @endverbatim * @@ -323,13 +323,13 @@ * example * @verbatim - ASYNC sentenceStarted(const QCString& appId, const uint jobNum, const uint seq); + ASYNC sentenceStarted(const TQCString& appId, const uint jobNum, const uint seq); @endverbatim * * becomes * @verbatim - "sentenceStarted(QCString,uint,uint)", + "sentenceStarted(TQCString,uint,uint)", @endverbatim * * in the connectDCOPSignal call. @@ -338,7 +338,7 @@ * is intended for your application. * @verbatim - ASYNC MyPart::sentenceStarted(const QCString& appId, const uint jobNum, const uint seq) + ASYNC MyPart::sentenceStarted(const TQCString& appId, const uint jobNum, const uint seq) { // Check appId to determine if this is our signal. if (appId != dcopClient()->appId()) return; @@ -686,7 +686,7 @@ class KSpeech : virtual public DCOPObject { * talker supports the indicated speech markup language. * @see kttsdMarkupType */ - virtual bool supportsMarkup(const QString &talker, uint markupType = 0) const = 0; + virtual bool supportsMarkup(const TQString &talker, uint markupType = 0) const = 0; /** * Determine whether the currently-configured speech plugin supports markers in speech markup. @@ -695,7 +695,7 @@ class KSpeech : virtual public DCOPObject { * @return True if the plugin currently configured for the indicated * talker supports markers. */ - virtual bool supportsMarkers(const QString &talker) const = 0; + virtual bool supportsMarkers(const TQString &talker) const = 0; /** * Say a message as soon as possible, interrupting any other speech in progress. @@ -710,7 +710,7 @@ class KSpeech : virtual public DCOPObject { * If an existing Screen Reader output is in progress, it is stopped and discarded and * replaced with this new message. */ - virtual ASYNC sayScreenReaderOutput(const QString &msg, const QString &talker) = 0; + virtual ASYNC sayScreenReaderOutput(const TQString &msg, const TQString &talker) = 0; /** * Say a warning. The warning will be spoken when the current sentence @@ -723,7 +723,7 @@ class KSpeech : virtual public DCOPObject { * If no plugin has been configured for the specified Talker code, * defaults to the closest matching talker. */ - virtual ASYNC sayWarning(const QString &warning, const QString &talker) = 0; + virtual ASYNC sayWarning(const TQString &warning, const TQString &talker) = 0; /** * Say a message. The message will be spoken when the current sentence stops speaking @@ -736,7 +736,7 @@ class KSpeech : virtual public DCOPObject { * If no talker has been configured for the specified talker code, * defaults to the closest matching talker. */ - virtual ASYNC sayMessage(const QString &message, const QString &talker) = 0; + virtual ASYNC sayMessage(const TQString &message, const TQString &talker) = 0; /** * Sets the GREP pattern that will be used as the sentence delimiter. @@ -752,7 +752,7 @@ class KSpeech : virtual public DCOPObject { * with a single space, and then replaces the sentence delimiters using * the following statement: @verbatim - QString::replace(sentenceDelimiter, "\\1\t"); + TQString::replace(sentenceDelimiter, "\\1\t"); @endverbatim * * which replaces all sentence delimiters with a tab, but @@ -764,7 +764,7 @@ class KSpeech : virtual public DCOPObject { * * @see sentenceparsing */ - virtual ASYNC setSentenceDelimiter(const QString &delimiter) = 0; + virtual ASYNC setSentenceDelimiter(const TQString &delimiter) = 0; /** * Queue a text job. Does not start speaking the text. @@ -790,7 +790,7 @@ class KSpeech : virtual public DCOPObject { * @see getTextCount * @see startText */ - virtual uint setText(const QString &text, const QString &talker) = 0; + virtual uint setText(const TQString &text, const TQString &talker) = 0; /** * Say a plain text job. This is a convenience method that @@ -820,7 +820,7 @@ class KSpeech : virtual public DCOPObject { * * @since KDE 3.5 */ - virtual uint sayText(const QString &text, const QString &talker) = 0; + virtual uint sayText(const TQString &text, const TQString &talker) = 0; /** * Adds another part to a text job. Does not start speaking the text. @@ -837,7 +837,7 @@ class KSpeech : virtual public DCOPObject { * @see setText. * @see startText. */ - virtual int appendText(const QString &text, uint jobNum=0) = 0; + virtual int appendText(const TQString &text, uint jobNum=0) = 0; /** * Queue a text job from the contents of a file. Does not start speaking the text. @@ -864,8 +864,8 @@ class KSpeech : virtual public DCOPObject { * @see getTextCount * @see startText */ - virtual uint setFile(const QString &filename, const QString &talker, - const QString& encoding) = 0; + virtual uint setFile(const TQString &filename, const TQString &talker, + const TQString& encoding) = 0; /** * Get the number of sentences in a text job. @@ -901,7 +901,7 @@ class KSpeech : virtual public DCOPObject { * Get a comma-separated list of text job numbers in the queue. * @return Comma-separated list of text job numbers in the queue. */ - virtual QString getTextJobNumbers() = 0; + virtual TQString getTextJobNumbers() = 0; /** * Get the state of a text job. @@ -919,13 +919,13 @@ class KSpeech : virtual public DCOPObject { * @param jobNum Job number of the text job. * If zero, applies to the last job queued by the application, * but if no such job, applies to the current job (if any). - * @return A QDataStream containing information about the job. + * @return A TQDataStream containing information about the job. * Blank if no such job. * * The stream contains the following elements: * - int state - Job state. - * - QCString appId - DCOP senderId of the application that requested the speech job. - * - QString talker - Talker Code requested by application. + * - TQCString appId - DCOP senderId of the application that requested the speech job. + * - TQString talker - Talker Code requested by application. * - int seq - Current sentence being spoken. Sentences are numbered starting at 1. * - int sentenceCount - Total number of sentences in the job. * - int partNum - Current part of the job begin spoken. Parts are numbered starting at 1. @@ -936,11 +936,11 @@ class KSpeech : virtual public DCOPObject { * * The following sample code will decode the stream: @code - QByteArray jobInfo = getTextJobInfo(jobNum); - QDataStream stream(jobInfo, IO_ReadOnly); + TQByteArray jobInfo = getTextJobInfo(jobNum); + TQDataStream stream(jobInfo, IO_ReadOnly); int state; - QCString appId; - QString talker; + TQCString appId; + TQString talker; int seq; int sentenceCount; int partNum; @@ -954,7 +954,7 @@ class KSpeech : virtual public DCOPObject { stream >> partCount; @endcode */ - virtual QByteArray getTextJobInfo(uint jobNum=0) = 0; + virtual TQByteArray getTextJobInfo(uint jobNum=0) = 0; /** * Given a Talker Code, returns the Talker ID of the talker that would speak @@ -962,7 +962,7 @@ class KSpeech : virtual public DCOPObject { * @param talkerCode Talker Code. * @return Talker ID of the talker that would speak the text job. */ - virtual QString talkerCodeToTalkerId(const QString& talkerCode) = 0; + virtual TQString talkerCodeToTalkerId(const TQString& talkerCode) = 0; /** * Return a sentence of a job. @@ -973,7 +973,7 @@ class KSpeech : virtual public DCOPObject { * @return The specified sentence in the specified job. If no such * job or sentence, returns "". */ - virtual QString getTextJobSentence(uint jobNum=0, uint seq=0) = 0; + virtual TQString getTextJobSentence(uint jobNum=0, uint seq=0) = 0; /** * Determine if kttsd is currently speaking any text jobs. @@ -1081,12 +1081,12 @@ class KSpeech : virtual public DCOPObject { /** * Get a list of the talkers configured in KTTS. - * @return A QStringList of fully-specified talker codes, one + * @return A TQStringList of fully-specified talker codes, one * for each talker user has configured. * * @see talkers */ - virtual QStringList getTalkers() = 0; + virtual TQStringList getTalkers() = 0; /** * Change the talker for a text job. @@ -1098,7 +1098,7 @@ class KSpeech : virtual public DCOPObject { * If no plugin has been configured for the specified Talker code, * defaults to the closest matching talker. */ - virtual ASYNC changeTextTalker(const QString &talker, uint jobNum=0 ) = 0; + virtual ASYNC changeTextTalker(const TQString &talker, uint jobNum=0 ) = 0; /** * Get the user's default talker. @@ -1107,7 +1107,7 @@ class KSpeech : virtual public DCOPObject { * @see talkers * @see getTalkers */ - virtual QString userDefaultTalker() = 0; + virtual TQString userDefaultTalker() = 0; /** * Move a text job down in the queue so that it is spoken later. @@ -1176,7 +1176,7 @@ class KSpeech : virtual public DCOPObject { * Return the KTTSD deamon version number. * @since KDE 3.5 */ - virtual QString version() = 0; + virtual TQString version() = 0; //@} k_dcop_signals: @@ -1200,7 +1200,7 @@ class KSpeech : virtual public DCOPObject { * * @see markers */ - void markerSeen(const QCString& appId, const QString& markerName); + void markerSeen(const TQCString& appId, const TQString& markerName); /** * This signal is emitted whenever a sentence begins speaking. * @param appId DCOP application ID of the application that queued the text. @@ -1209,7 +1209,7 @@ class KSpeech : virtual public DCOPObject { * * @see getTextCount */ - void sentenceStarted(const QCString& appId, uint jobNum, uint seq); + void sentenceStarted(const TQCString& appId, uint jobNum, uint seq); /** * This signal is emitted when a sentence has finished speaking. * @param appId DCOP application ID of the application that queued the text. @@ -1218,14 +1218,14 @@ class KSpeech : virtual public DCOPObject { * * @see getTextCount */ - void sentenceFinished(const QCString& appId, uint jobNum, uint seq); + void sentenceFinished(const TQCString& appId, uint jobNum, uint seq); /** * This signal is emitted whenever a new text job is added to the queue. * @param appId The DCOP senderId of the application that created the job. * @param jobNum Job number of the text job. */ - void textSet(const QCString& appId, uint jobNum); + void textSet(const TQCString& appId, uint jobNum); /** * This signal is emitted whenever a new part is appended to a text job. @@ -1234,14 +1234,14 @@ class KSpeech : virtual public DCOPObject { * @param partNum Part number of the new part. Parts are numbered starting * at 1. */ - void textAppended(const QCString& appId, uint jobNum, int partNum); + void textAppended(const TQCString& appId, uint jobNum, int partNum); /** * This signal is emitted whenever speaking of a text job begins. * @param appId The DCOP senderId of the application that created the job. * @param jobNum Job number of the text job. */ - void textStarted(const QCString& appId, uint jobNum); + void textStarted(const TQCString& appId, uint jobNum); /** * This signal is emitted whenever a text job is finished. The job has * been marked for deletion from the queue and will be deleted when another @@ -1251,7 +1251,7 @@ class KSpeech : virtual public DCOPObject { * @param appId The DCOP senderId of the application that created the job. * @param jobNum Job number of the text job. */ - void textFinished(const QCString& appId, uint jobNum); + void textFinished(const TQCString& appId, uint jobNum); /** * This signal is emitted whenever a speaking text job stops speaking. * @param appId The DCOP senderId of the application that created the job. @@ -1260,26 +1260,26 @@ class KSpeech : virtual public DCOPObject { * The signal is only emitted if stopText() is called and the job is currently * speaking. */ - void textStopped(const QCString& appId, uint jobNum); + void textStopped(const TQCString& appId, uint jobNum); /** * This signal is emitted whenever a speaking text job is paused. * @param appId The DCOP senderId of the application that created the job. * @param jobNum Job number of the text job. */ - void textPaused(const QCString& appId, uint jobNum); + void textPaused(const TQCString& appId, uint jobNum); /** * This signal is emitted when a text job, that was previously paused, resumes speaking. * @param appId The DCOP senderId of the application that created the job. * @param jobNum Job number of the text job. */ - void textResumed(const QCString& appId, uint jobNum); + void textResumed(const TQCString& appId, uint jobNum); /** * This signal is emitted whenever a text job is deleted from the queue. * The job is no longer in the queue when this signal is emitted. * @param appId The DCOP senderId of the application that created the job. * @param jobNum Job number of the text job. */ - void textRemoved(const QCString& appId, uint jobNum); + void textRemoved(const TQCString& appId, uint jobNum); //@} }; diff --git a/interfaces/kspeech/kspeechsink.h b/interfaces/kspeech/kspeechsink.h index e90a005f1..51715b9a1 100644 --- a/interfaces/kspeech/kspeechsink.h +++ b/interfaces/kspeech/kspeechsink.h @@ -84,7 +84,7 @@ class KSpeechSink : virtual public DCOPObject { * @param markerName The name of the marker seen. * @see markers */ - virtual ASYNC markerSeen(const QCString& appId, const QString& markerName) { Q_UNUSED(appId); Q_UNUSED(markerName); }; + virtual ASYNC markerSeen(const TQCString& appId, const TQString& markerName) { Q_UNUSED(appId); Q_UNUSED(markerName); }; /** * This signal is emitted whenever a sentence begins speaking. * @param appId DCOP application ID of the application that queued the text. @@ -92,7 +92,7 @@ class KSpeechSink : virtual public DCOPObject { * @param seq Sequence number of the text. * @see getTextCount */ - virtual ASYNC sentenceStarted(const QCString& appId, uint jobNum, uint seq) { Q_UNUSED(appId); Q_UNUSED(jobNum); Q_UNUSED(seq); }; + virtual ASYNC sentenceStarted(const TQCString& appId, uint jobNum, uint seq) { Q_UNUSED(appId); Q_UNUSED(jobNum); Q_UNUSED(seq); }; /** * This signal is emitted when a sentence has finished speaking. * @param appId DCOP application ID of the application that queued the text. @@ -100,14 +100,14 @@ class KSpeechSink : virtual public DCOPObject { * @param seq Sequence number of the text. * @see getTextCount */ - virtual ASYNC sentenceFinished(const QCString& appId, uint jobNum, uint seq) { Q_UNUSED(appId); Q_UNUSED(jobNum); Q_UNUSED(seq); }; + virtual ASYNC sentenceFinished(const TQCString& appId, uint jobNum, uint seq) { Q_UNUSED(appId); Q_UNUSED(jobNum); Q_UNUSED(seq); }; /** * This signal is emitted whenever a new text job is added to the queue. * @param appId The DCOP senderId of the application that created the job. NULL if kttsd. * @param jobNum Job number of the text job. */ - virtual ASYNC textSet(const QCString& appId, uint jobNum) { Q_UNUSED(appId); Q_UNUSED(jobNum); }; + virtual ASYNC textSet(const TQCString& appId, uint jobNum) { Q_UNUSED(appId); Q_UNUSED(jobNum); }; /** * This signal is emitted whenever a new part is appended to a text job. @@ -116,14 +116,14 @@ class KSpeechSink : virtual public DCOPObject { * @param partNum Part number of the new part. Parts are numbered starting * at 1. */ - virtual ASYNC textAppended(const QCString& appId, uint jobNum, int partNum) { Q_UNUSED(appId); Q_UNUSED(jobNum); Q_UNUSED(partNum); }; + virtual ASYNC textAppended(const TQCString& appId, uint jobNum, int partNum) { Q_UNUSED(appId); Q_UNUSED(jobNum); Q_UNUSED(partNum); }; /** * This signal is emitted whenever speaking of a text job begins. * @param appId The DCOP senderId of the application that created the job. NULL if kttsd. * @param jobNum Job number of the text job. */ - virtual ASYNC textStarted(const QCString& appId, uint jobNum) { Q_UNUSED(appId); Q_UNUSED(jobNum); }; + virtual ASYNC textStarted(const TQCString& appId, uint jobNum) { Q_UNUSED(appId); Q_UNUSED(jobNum); }; /** * This signal is emitted whenever a text job is finished. The job has * been marked for deletion from the queue and will be deleted when another @@ -133,32 +133,32 @@ class KSpeechSink : virtual public DCOPObject { * @param appId The DCOP senderId of the application that created the job. NULL if kttsd. * @param jobNum Job number of the text job. */ - virtual ASYNC textFinished(const QCString& appId, uint jobNum) { Q_UNUSED(appId); Q_UNUSED(jobNum); }; + virtual ASYNC textFinished(const TQCString& appId, uint jobNum) { Q_UNUSED(appId); Q_UNUSED(jobNum); }; /** * This signal is emitted whenever a speaking text job stops speaking. * @param appId The DCOP senderId of the application that created the job. NULL if kttsd. * @param jobNum Job number of the text job. */ - virtual ASYNC textStopped(const QCString& appId, uint jobNum) { Q_UNUSED(appId); Q_UNUSED(jobNum); }; + virtual ASYNC textStopped(const TQCString& appId, uint jobNum) { Q_UNUSED(appId); Q_UNUSED(jobNum); }; /** * This signal is emitted whenever a speaking text job is paused. * @param appId The DCOP senderId of the application that created the job. NULL if kttsd. * @param jobNum Job number of the text job. */ - virtual ASYNC textPaused(const QCString& appId, uint jobNum) { Q_UNUSED(appId); Q_UNUSED(jobNum); }; + virtual ASYNC textPaused(const TQCString& appId, uint jobNum) { Q_UNUSED(appId); Q_UNUSED(jobNum); }; /** * This signal is emitted when a text job, that was previously paused, resumes speaking. * @param appId The DCOP senderId of the application that created the job. NULL if kttsd. * @param jobNum Job number of the text job. */ - virtual ASYNC textResumed(const QCString& appId, uint jobNum) { Q_UNUSED(appId); Q_UNUSED(jobNum); }; + virtual ASYNC textResumed(const TQCString& appId, uint jobNum) { Q_UNUSED(appId); Q_UNUSED(jobNum); }; /** * This signal is emitted whenever a text job is deleted from the queue. * The job is no longer in the queue when this signal is emitted. * @param appId The DCOP senderId of the application that created the job. NULL if kttsd. * @param jobNum Job number of the text job. */ - virtual ASYNC textRemoved(const QCString& appId, uint jobNum) { Q_UNUSED(appId); Q_UNUSED(jobNum); }; + virtual ASYNC textRemoved(const TQCString& appId, uint jobNum) { Q_UNUSED(appId); Q_UNUSED(jobNum); }; }; #endif // _KSPEECHSINK_H_ diff --git a/interfaces/ktexteditor/blockselectiondcopinterface.h b/interfaces/ktexteditor/blockselectiondcopinterface.h index 19fc950cb..4b74fd2a0 100644 --- a/interfaces/ktexteditor/blockselectiondcopinterface.h +++ b/interfaces/ktexteditor/blockselectiondcopinterface.h @@ -3,8 +3,8 @@ #include <dcopobject.h> #include <dcopref.h> -#include <qstringlist.h> -#include <qcstring.h> +#include <tqstringlist.h> +#include <tqcstring.h> namespace KTextEditor { diff --git a/interfaces/ktexteditor/blockselectioninterface.cpp b/interfaces/ktexteditor/blockselectioninterface.cpp index 80e0c8570..c1af4a6ed 100644 --- a/interfaces/ktexteditor/blockselectioninterface.cpp +++ b/interfaces/ktexteditor/blockselectioninterface.cpp @@ -43,7 +43,7 @@ BlockSelectionInterface::BlockSelectionInterface() { globalBlockSelectionInterfaceNumber++; myBlockSelectionInterfaceNumber = globalBlockSelectionInterfaceNumber++; - QString name = "BlockSelectionInterface#" + QString::number(myBlockSelectionInterfaceNumber); + TQString name = "BlockSelectionInterface#" + TQString::number(myBlockSelectionInterfaceNumber); d = new PrivateBlockSelectionInterface(); d->interface = new BlockSelectionDCOPInterface(this, name.latin1()); @@ -60,7 +60,7 @@ unsigned int BlockSelectionInterface::blockSelectionInterfaceNumber () const return myBlockSelectionInterfaceNumber; } -void BlockSelectionInterface::setBlockSelectionInterfaceDCOPSuffix (const QCString &suffix) +void BlockSelectionInterface::setBlockSelectionInterfaceDCOPSuffix (const TQCString &suffix) { d->interface->setObjId ("BlockSelectionInterface#"+suffix); } diff --git a/interfaces/ktexteditor/blockselectioninterface.h b/interfaces/ktexteditor/blockselectioninterface.h index d5104208c..9940f0da4 100644 --- a/interfaces/ktexteditor/blockselectioninterface.h +++ b/interfaces/ktexteditor/blockselectioninterface.h @@ -42,7 +42,7 @@ class KTEXTEDITOR_EXPORT BlockSelectionInterface unsigned int blockSelectionInterfaceNumber () const; protected: - void setBlockSelectionInterfaceDCOPSuffix (const QCString &suffix); + void setBlockSelectionInterfaceDCOPSuffix (const TQCString &suffix); /** * slots !!! diff --git a/interfaces/ktexteditor/clipboarddcopinterface.h b/interfaces/ktexteditor/clipboarddcopinterface.h index fe4c3d3c7..8104e9d4d 100644 --- a/interfaces/ktexteditor/clipboarddcopinterface.h +++ b/interfaces/ktexteditor/clipboarddcopinterface.h @@ -3,8 +3,8 @@ #include <dcopobject.h> #include <dcopref.h> -#include <qstringlist.h> -#include <qcstring.h> +#include <tqstringlist.h> +#include <tqcstring.h> namespace KTextEditor { diff --git a/interfaces/ktexteditor/clipboardinterface.cpp b/interfaces/ktexteditor/clipboardinterface.cpp index 5d267841a..4401b29de 100644 --- a/interfaces/ktexteditor/clipboardinterface.cpp +++ b/interfaces/ktexteditor/clipboardinterface.cpp @@ -28,7 +28,7 @@ ClipboardInterface::ClipboardInterface() d = new PrivateClipboardInterface(); globalClipboardInterfaceNumber++; myClipboardInterfaceNumber = globalClipboardInterfaceNumber++; - QString name = "ClipboardInterface#" + QString::number(myClipboardInterfaceNumber); + TQString name = "ClipboardInterface#" + TQString::number(myClipboardInterfaceNumber); d->interface = new ClipboardDCOPInterface(this, name.latin1()); } ClipboardInterface::~ClipboardInterface() @@ -42,7 +42,7 @@ unsigned int ClipboardInterface::clipboardInterfaceNumber () const return myClipboardInterfaceNumber; } -void ClipboardInterface::setClipboardInterfaceDCOPSuffix (const QCString &suffix) +void ClipboardInterface::setClipboardInterfaceDCOPSuffix (const TQCString &suffix) { d->interface->setObjId ("ClipboardInterface#"+suffix); } diff --git a/interfaces/ktexteditor/clipboardinterface.h b/interfaces/ktexteditor/clipboardinterface.h index c55df503e..3e1143240 100644 --- a/interfaces/ktexteditor/clipboardinterface.h +++ b/interfaces/ktexteditor/clipboardinterface.h @@ -40,7 +40,7 @@ class KTEXTEDITOR_EXPORT ClipboardInterface unsigned int clipboardInterfaceNumber () const; protected: - void setClipboardInterfaceDCOPSuffix (const QCString &suffix); + void setClipboardInterfaceDCOPSuffix (const TQCString &suffix); /** * slots !!! diff --git a/interfaces/ktexteditor/codecompletioninterface.cpp b/interfaces/ktexteditor/codecompletioninterface.cpp index 51250d2d6..ae60b2162 100644 --- a/interfaces/ktexteditor/codecompletioninterface.cpp +++ b/interfaces/ktexteditor/codecompletioninterface.cpp @@ -35,7 +35,7 @@ unsigned int CodeCompletionInterface::codeCompletionInterfaceNumber () const return myCodeCompletionInterfaceNumber; } -void CodeCompletionInterface::setCodeCompletionInterfaceDCOPSuffix (const QCString &/*suffix*/) +void CodeCompletionInterface::setCodeCompletionInterfaceDCOPSuffix (const TQCString &/*suffix*/) { //d->interface->setObjId ("CodeCompletionInterface#"+suffix); } diff --git a/interfaces/ktexteditor/codecompletioninterface.h b/interfaces/ktexteditor/codecompletioninterface.h index d1174d32a..780c02bbe 100644 --- a/interfaces/ktexteditor/codecompletioninterface.h +++ b/interfaces/ktexteditor/codecompletioninterface.h @@ -19,8 +19,8 @@ #ifndef __ktexteditor_codecompletioninterface_h__ #define __ktexteditor_codecompletioninterface_h__ -#include <qstring.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqstringlist.h> #include <kdelibs_export.h> @@ -42,13 +42,13 @@ namespace KTextEditor class KTEXTEDITOR_EXPORT CompletionEntry { public: - QString type; - QString text; - QString prefix; - QString postfix; - QString comment; + TQString type; + TQString text; + TQString prefix; + TQString postfix; + TQString comment; - QString userdata; + TQString userdata; bool operator==( const CompletionEntry &c ) const { return ( c.type == type && @@ -94,7 +94,7 @@ class KTEXTEDITOR_EXPORT CodeCompletionInterface unsigned int codeCompletionInterfaceNumber () const; protected: - void setCodeCompletionInterfaceDCOPSuffix (const QCString &suffix); + void setCodeCompletionInterfaceDCOPSuffix (const TQCString &suffix); public: @@ -104,7 +104,7 @@ class KTEXTEDITOR_EXPORT CodeCompletionInterface /** * This shows an argument hint. */ - virtual void showArgHint (QStringList functionList, const QString& strWrapping, const QString& strDelimiter) = 0; + virtual void showArgHint (TQStringList functionList, const TQString& strWrapping, const TQString& strDelimiter) = 0; /** * This shows a completion list. @p offset is the real start of the text that @@ -112,7 +112,7 @@ class KTEXTEDITOR_EXPORT CodeCompletionInterface * position. if @p casesensitive is @p true, the popup will only contain completions * that match the input text regarding case. */ - virtual void showCompletionBox (QValueList<CompletionEntry> complList,int offset=0, bool casesensitive=true)=0; + virtual void showCompletionBox (TQValueList<CompletionEntry> complList,int offset=0, bool casesensitive=true)=0; // // signals !!! @@ -186,7 +186,7 @@ class KTEXTEDITOR_EXPORT CodeCompletionInterface * IMPORTANT FOR IMPLEMENTERS: When you don't support this signal, please just override the inherited * function, if you support it, declare it as a signal */ - virtual void filterInsertString(CompletionEntry*,QString*)=0; + virtual void filterInsertString(CompletionEntry*,TQString*)=0; private: diff --git a/interfaces/ktexteditor/configinterface.cpp b/interfaces/ktexteditor/configinterface.cpp index 39d2454ba..2ca2e4b12 100644 --- a/interfaces/ktexteditor/configinterface.cpp +++ b/interfaces/ktexteditor/configinterface.cpp @@ -57,7 +57,7 @@ unsigned int ConfigInterface::configInterfaceNumber () const return myConfigInterfaceNumber; } -void ConfigInterface::setConfigInterfaceDCOPSuffix (const QCString &/*suffix*/) +void ConfigInterface::setConfigInterfaceDCOPSuffix (const TQCString &/*suffix*/) { //d->interface->setObjId ("ConfigInterface#"+suffix); } diff --git a/interfaces/ktexteditor/configinterface.h b/interfaces/ktexteditor/configinterface.h index f80603d01..5b89ff413 100644 --- a/interfaces/ktexteditor/configinterface.h +++ b/interfaces/ktexteditor/configinterface.h @@ -42,7 +42,7 @@ class KTEXTEDITOR_EXPORT ConfigInterface unsigned int configInterfaceNumber () const; protected: - void setConfigInterfaceDCOPSuffix (const QCString &suffix); + void setConfigInterfaceDCOPSuffix (const TQCString &suffix); // // slots !!! diff --git a/interfaces/ktexteditor/configinterfaceextension.cpp b/interfaces/ktexteditor/configinterfaceextension.cpp index 9f7456cbe..8557c422f 100644 --- a/interfaces/ktexteditor/configinterfaceextension.cpp +++ b/interfaces/ktexteditor/configinterfaceextension.cpp @@ -38,7 +38,7 @@ class PrivateConfigInterfaceExtension using namespace KTextEditor; -ConfigPage::ConfigPage ( QWidget *parent, const char *name ) : QWidget (parent, name) { ; } +ConfigPage::ConfigPage ( TQWidget *parent, const char *name ) : TQWidget (parent, name) { ; } ConfigPage::~ConfigPage () { ; } @@ -62,7 +62,7 @@ unsigned int ConfigInterfaceExtension::configInterfaceExtensionNumber () const return myConfigInterfaceExtensionNumber; } -void ConfigInterfaceExtension::setConfigInterfaceExtensionDCOPSuffix (const QCString &/*suffix*/) +void ConfigInterfaceExtension::setConfigInterfaceExtensionDCOPSuffix (const TQCString &/*suffix*/) { //d->interface->setObjId ("ConfigInterfaceExtension#"+suffix); } diff --git a/interfaces/ktexteditor/configinterfaceextension.h b/interfaces/ktexteditor/configinterfaceextension.h index abec0f0fe..6ebfd8895 100644 --- a/interfaces/ktexteditor/configinterfaceextension.h +++ b/interfaces/ktexteditor/configinterfaceextension.h @@ -19,8 +19,8 @@ #ifndef __ktexteditor_configinterfaceextension_h__ #define __ktexteditor_configinterfaceextension_h__ -#include <qwidget.h> -#include <qpixmap.h> +#include <tqwidget.h> +#include <tqpixmap.h> #include <kicontheme.h> namespace KTextEditor @@ -31,7 +31,7 @@ class KTEXTEDITOR_EXPORT ConfigPage : public QWidget Q_OBJECT public: - ConfigPage ( QWidget *parent=0, const char *name=0 ); + ConfigPage ( TQWidget *parent=0, const char *name=0 ); virtual ~ConfigPage (); // @@ -75,7 +75,7 @@ class KTEXTEDITOR_EXPORT ConfigInterfaceExtension unsigned int configInterfaceExtensionNumber () const; protected: - void setConfigInterfaceExtensionDCOPSuffix (const QCString &suffix); + void setConfigInterfaceExtensionDCOPSuffix (const TQCString &suffix); // // slots !!! @@ -91,11 +91,11 @@ class KTEXTEDITOR_EXPORT ConfigInterfaceExtension config pages from 0 to configPages()-1 are available if configPages() > 0 */ - virtual ConfigPage *configPage (uint number = 0, QWidget *parent = 0, const char *name=0 ) = 0; + virtual ConfigPage *configPage (uint number = 0, TQWidget *parent = 0, const char *name=0 ) = 0; - virtual QString configPageName (uint number = 0) const = 0; - virtual QString configPageFullName (uint number = 0) const = 0; - virtual QPixmap configPagePixmap (uint number = 0, int size = KIcon::SizeSmall) const = 0; + virtual TQString configPageName (uint number = 0) const = 0; + virtual TQString configPageFullName (uint number = 0) const = 0; + virtual TQPixmap configPagePixmap (uint number = 0, int size = KIcon::SizeSmall) const = 0; private: diff --git a/interfaces/ktexteditor/cursorinterface.cpp b/interfaces/ktexteditor/cursorinterface.cpp index 9dec0de30..91a14b06a 100644 --- a/interfaces/ktexteditor/cursorinterface.cpp +++ b/interfaces/ktexteditor/cursorinterface.cpp @@ -55,7 +55,7 @@ unsigned int CursorInterface::cursorInterfaceNumber () const return myCursorInterfaceNumber; } -void CursorInterface::setCursorInterfaceDCOPSuffix (const QCString &/*suffix*/) +void CursorInterface::setCursorInterfaceDCOPSuffix (const TQCString &/*suffix*/) { //d->interface->setObjId ("CursorInterface#"+suffix); } diff --git a/interfaces/ktexteditor/cursorinterface.h b/interfaces/ktexteditor/cursorinterface.h index b243d3c4c..ad3e0134b 100644 --- a/interfaces/ktexteditor/cursorinterface.h +++ b/interfaces/ktexteditor/cursorinterface.h @@ -19,8 +19,8 @@ #ifndef __ktexteditor_cursorinterface_h__ #define __ktexteditor_cursorinterface_h__ -#include <qptrlist.h> -#include <qstring.h> +#include <tqptrlist.h> +#include <tqstring.h> #include <kdelibs_export.h> @@ -37,11 +37,11 @@ class KTEXTEDITOR_EXPORT Cursor virtual bool setPosition ( unsigned int line, unsigned int col ) = 0; - virtual bool insertText ( const QString& text ) = 0; + virtual bool insertText ( const TQString& text ) = 0; virtual bool removeText ( unsigned int numberOfCharacters ) = 0; - virtual QChar currentChar () const = 0; + virtual TQChar currentChar () const = 0; }; /** @@ -58,7 +58,7 @@ class KTEXTEDITOR_EXPORT CursorInterface unsigned int cursorInterfaceNumber () const; protected: - void setCursorInterfaceDCOPSuffix (const QCString &suffix); + void setCursorInterfaceDCOPSuffix (const TQCString &suffix); public: /** @@ -69,7 +69,7 @@ class KTEXTEDITOR_EXPORT CursorInterface /* * Accessor to the list of cursors. */ - virtual QPtrList<Cursor> cursors () const = 0; + virtual TQPtrList<Cursor> cursors () const = 0; private: class PrivateCursorInterface *d; diff --git a/interfaces/ktexteditor/document.h b/interfaces/ktexteditor/document.h index 9260d596c..624c344b9 100644 --- a/interfaces/ktexteditor/document.h +++ b/interfaces/ktexteditor/document.h @@ -35,7 +35,7 @@ class KTEXTEDITOR_EXPORT Document : public KTextEditor::Editor Q_OBJECT public: - Document ( QObject *parent = 0, const char *name = 0 ); + Document ( TQObject *parent = 0, const char *name = 0 ); virtual ~Document (); /** @@ -46,19 +46,19 @@ class KTEXTEDITOR_EXPORT Document : public KTextEditor::Editor /** * Returns this document's DCOP suffix for identifiying its DCOP interface. */ - QCString documentDCOPSuffix () const; + TQCString documentDCOPSuffix () const; /** * Create a view that will display the document data. You can create as many * views as you like. When the user modifies data in one view then all other * views will be updated as well. */ - virtual class View *createView ( QWidget *parent, const char *name = 0 ) = 0; + virtual class View *createView ( TQWidget *parent, const char *name = 0 ) = 0; /* * Returns a list of all views of this document. */ - virtual QPtrList<class View> views () const = 0; + virtual TQPtrList<class View> views () const = 0; private: class PrivateDocument *d; @@ -66,7 +66,7 @@ class KTEXTEDITOR_EXPORT Document : public KTextEditor::Editor unsigned int myDocumentNumber; }; -KTEXTEDITOR_EXPORT Document *createDocument ( const char* libname, QObject *parent = 0, const char *name = 0 ); +KTEXTEDITOR_EXPORT Document *createDocument ( const char* libname, TQObject *parent = 0, const char *name = 0 ); } diff --git a/interfaces/ktexteditor/documentdcopinfo.cpp b/interfaces/ktexteditor/documentdcopinfo.cpp index 7377fcf79..b339d01cd 100644 --- a/interfaces/ktexteditor/documentdcopinfo.cpp +++ b/interfaces/ktexteditor/documentdcopinfo.cpp @@ -15,7 +15,7 @@ DocumentInfoDCOPInterface::~DocumentInfoDCOPInterface() } -QString DocumentInfoDCOPInterface::mimeType() +TQString DocumentInfoDCOPInterface::mimeType() { return m_parent->mimeType(); } @@ -23,7 +23,7 @@ long DocumentInfoDCOPInterface::fileSize() { return m_parent->fileSize(); } -QString DocumentInfoDCOPInterface::niceFileSize() +TQString DocumentInfoDCOPInterface::niceFileSize() { return m_parent->niceFileSize(); } diff --git a/interfaces/ktexteditor/documentdcopinfo.h b/interfaces/ktexteditor/documentdcopinfo.h index 2293ff119..ea25284fe 100644 --- a/interfaces/ktexteditor/documentdcopinfo.h +++ b/interfaces/ktexteditor/documentdcopinfo.h @@ -3,8 +3,8 @@ #include <dcopobject.h> #include <dcopref.h> -#include <qstringlist.h> -#include <qcstring.h> +#include <tqstringlist.h> +#include <tqcstring.h> namespace KTextEditor { @@ -34,9 +34,9 @@ namespace KTextEditor */ virtual ~DocumentInfoDCOPInterface(); k_dcop: - QString mimeType(); + TQString mimeType(); long fileSize(); - QString niceFileSize(); + TQString niceFileSize(); uint documentInfoInterfaceNumber (); private: DocumentInfoInterface *m_parent; diff --git a/interfaces/ktexteditor/documentinfo.cpp b/interfaces/ktexteditor/documentinfo.cpp index 0047b5454..c675bfb5f 100644 --- a/interfaces/ktexteditor/documentinfo.cpp +++ b/interfaces/ktexteditor/documentinfo.cpp @@ -44,7 +44,7 @@ DocumentInfoInterface::DocumentInfoInterface() myDocumentInfoInterfaceNumber = globalDocumentInfoInterfaceNumber++; d = new PrivateDocumentInfoInterface(); - QString name = "DocumentInterface#" + QString::number(myDocumentInfoInterfaceNumber); + TQString name = "DocumentInterface#" + TQString::number(myDocumentInfoInterfaceNumber); d->interface = new DocumentInfoDCOPInterface(this, name.latin1()); } @@ -59,7 +59,7 @@ unsigned int DocumentInfoInterface::documentInfoInterfaceNumber () const return myDocumentInfoInterfaceNumber; } -void DocumentInfoInterface::setDocumentInfoInterfaceDCOPSuffix (const QCString &suffix) +void DocumentInfoInterface::setDocumentInfoInterfaceDCOPSuffix (const TQCString &suffix) { d->interface->setObjId ("DocumentInfoInterface#"+suffix); } diff --git a/interfaces/ktexteditor/documentinfo.h b/interfaces/ktexteditor/documentinfo.h index 9e6eb06e5..0832288de 100644 --- a/interfaces/ktexteditor/documentinfo.h +++ b/interfaces/ktexteditor/documentinfo.h @@ -39,14 +39,14 @@ class KTEXTEDITOR_EXPORT DocumentInfoInterface DocumentInfoInterface(); virtual ~DocumentInfoInterface(); - virtual QString mimeType()=0; + virtual TQString mimeType()=0; virtual long fileSize()=0; - virtual QString niceFileSize()=0; + virtual TQString niceFileSize()=0; unsigned int documentInfoInterfaceNumber () const; protected: - void setDocumentInfoInterfaceDCOPSuffix (const QCString &suffix); + void setDocumentInfoInterfaceDCOPSuffix (const TQCString &suffix); private: class PrivateDocumentInfoInterface *d; diff --git a/interfaces/ktexteditor/dynwordwrapinterface.cpp b/interfaces/ktexteditor/dynwordwrapinterface.cpp index e8448ed9c..49d4060c0 100644 --- a/interfaces/ktexteditor/dynwordwrapinterface.cpp +++ b/interfaces/ktexteditor/dynwordwrapinterface.cpp @@ -55,7 +55,7 @@ unsigned int DynWordWrapInterface::dynWordWrapInterfaceNumber () const return myDynWordWrapInterfaceNumber; } -void DynWordWrapInterface::setDynWordWrapInterfaceDCOPSuffix (const QCString &/*suffix*/) +void DynWordWrapInterface::setDynWordWrapInterfaceDCOPSuffix (const TQCString &/*suffix*/) { //d->interface->setObjId ("DynWordWrapInterface#"+suffix); } diff --git a/interfaces/ktexteditor/dynwordwrapinterface.h b/interfaces/ktexteditor/dynwordwrapinterface.h index 165b4191d..2576ae6f0 100644 --- a/interfaces/ktexteditor/dynwordwrapinterface.h +++ b/interfaces/ktexteditor/dynwordwrapinterface.h @@ -42,7 +42,7 @@ class KTEXTEDITOR_EXPORT DynWordWrapInterface unsigned int dynWordWrapInterfaceNumber () const; protected: - void setDynWordWrapInterfaceDCOPSuffix (const QCString &suffix); + void setDynWordWrapInterfaceDCOPSuffix (const TQCString &suffix); // // slots !!! diff --git a/interfaces/ktexteditor/editdcopinterface.cpp b/interfaces/ktexteditor/editdcopinterface.cpp index 1a002d775..6130ccd14 100644 --- a/interfaces/ktexteditor/editdcopinterface.cpp +++ b/interfaces/ktexteditor/editdcopinterface.cpp @@ -15,12 +15,12 @@ EditDCOPInterface::~EditDCOPInterface() } -QString EditDCOPInterface::text () +TQString EditDCOPInterface::text () { return m_parent->text(); } -QString EditDCOPInterface::textLine ( uint line ) +TQString EditDCOPInterface::textLine ( uint line ) { return m_parent->textLine(line); } @@ -35,12 +35,12 @@ int EditDCOPInterface::length () return m_parent->length(); } -void EditDCOPInterface::setText ( const QString &text ) +void EditDCOPInterface::setText ( const TQString &text ) { m_parent->setText(text); } -bool EditDCOPInterface::insertText ( uint line, uint col, const QString &text ) +bool EditDCOPInterface::insertText ( uint line, uint col, const TQString &text ) { return m_parent->insertText( line, col, text); } @@ -50,7 +50,7 @@ bool EditDCOPInterface::removeText ( uint startLine, uint startCol, uint endLine return m_parent->removeText( startLine, startCol, endLine, endCol); } -bool EditDCOPInterface::insertLine ( uint line, const QString &text ) +bool EditDCOPInterface::insertLine ( uint line, const TQString &text ) { return m_parent->insertLine( line, text); } diff --git a/interfaces/ktexteditor/editdcopinterface.h b/interfaces/ktexteditor/editdcopinterface.h index b6956d5fa..f169fb15b 100644 --- a/interfaces/ktexteditor/editdcopinterface.h +++ b/interfaces/ktexteditor/editdcopinterface.h @@ -3,8 +3,8 @@ #include <dcopobject.h> #include <dcopref.h> -#include <qstringlist.h> -#include <qcstring.h> +#include <tqstringlist.h> +#include <tqcstring.h> //#include "editdcopinterface.moc" namespace KTextEditor { @@ -36,12 +36,12 @@ namespace KTextEditor /** * @return the complete document as a single QString */ - virtual QString text (); + virtual TQString text (); /** * @return All the text from the requested line. */ - virtual QString textLine ( uint line ); + virtual TQString textLine ( uint line ); /** * @return The current number of lines in the document @@ -57,13 +57,13 @@ namespace KTextEditor * Set the given text into the view. * Warning: This will overwrite any data currently held in this view. */ - virtual void setText (const QString &text ); + virtual void setText (const TQString &text ); /** * Inserts text at line "line", column "col" * returns true if success */ - virtual bool insertText ( uint line, uint col, const QString &text ); + virtual bool insertText ( uint line, uint col, const TQString &text ); /** * remove text at line "line", column "col" @@ -74,7 +74,7 @@ namespace KTextEditor /** * Insert line(s) at the given line number. */ - virtual bool insertLine ( uint line, const QString &text ); + virtual bool insertLine ( uint line, const TQString &text ); /** * Insert line(s) at the given line number. diff --git a/interfaces/ktexteditor/editinterface.cpp b/interfaces/ktexteditor/editinterface.cpp index 095c44ba9..6722fc555 100644 --- a/interfaces/ktexteditor/editinterface.cpp +++ b/interfaces/ktexteditor/editinterface.cpp @@ -27,7 +27,7 @@ EditInterface::EditInterface() d = new PrivateEditInterface(); globalEditInterfaceNumber++; myEditInterfaceNumber = globalEditInterfaceNumber; - QString name = "EditInterface#" + QString::number(myEditInterfaceNumber); + TQString name = "EditInterface#" + TQString::number(myEditInterfaceNumber); d->interface = new EditDCOPInterface(this, name.latin1()); } @@ -42,7 +42,7 @@ uint EditInterface::editInterfaceNumber () const return myEditInterfaceNumber; } -void EditInterface::setEditInterfaceDCOPSuffix (const QCString &suffix) +void EditInterface::setEditInterfaceDCOPSuffix (const TQCString &suffix) { d->interface->setObjId ("EditInterface#"+suffix); } diff --git a/interfaces/ktexteditor/editinterface.h b/interfaces/ktexteditor/editinterface.h index baea99803..a2f8f5fe6 100644 --- a/interfaces/ktexteditor/editinterface.h +++ b/interfaces/ktexteditor/editinterface.h @@ -19,7 +19,7 @@ #ifndef __ktexteditor_editinterface_h__ #define __ktexteditor_editinterface_h__ -#include <qstring.h> +#include <tqstring.h> #include <kdelibs_export.h> @@ -41,7 +41,7 @@ class KTEXTEDITOR_EXPORT EditInterface uint editInterfaceNumber () const; protected: - void setEditInterfaceDCOPSuffix (const QCString &suffix); + void setEditInterfaceDCOPSuffix (const TQCString &suffix); public: /** @@ -50,17 +50,17 @@ class KTEXTEDITOR_EXPORT EditInterface /** * @return the complete document as a single QString */ - virtual QString text () const = 0; + virtual TQString text () const = 0; /** * @return a QString */ - virtual QString text ( uint startLine, uint startCol, uint endLine, uint endCol ) const = 0; + virtual TQString text ( uint startLine, uint startCol, uint endLine, uint endCol ) const = 0; /** * @return All the text from the requested line. */ - virtual QString textLine ( uint line ) const = 0; + virtual TQString textLine ( uint line ) const = 0; /** * @return The current number of lines in the document @@ -81,7 +81,7 @@ class KTEXTEDITOR_EXPORT EditInterface * Set the given text into the view. * Warning: This will overwrite any data currently held in this view. */ - virtual bool setText ( const QString &text ) = 0; + virtual bool setText ( const TQString &text ) = 0; /** * clears the document @@ -94,7 +94,7 @@ class KTEXTEDITOR_EXPORT EditInterface * returns true if success * Use insertText(numLines(), ...) to append text at end of document */ - virtual bool insertText ( uint line, uint col, const QString &text ) = 0; + virtual bool insertText ( uint line, uint col, const TQString &text ) = 0; /** * remove text at line "line", column "col" @@ -106,7 +106,7 @@ class KTEXTEDITOR_EXPORT EditInterface * Insert line(s) at the given line number. * Use insertLine(numLines(), text) to append line at end of document */ - virtual bool insertLine ( uint line, const QString &text ) = 0; + virtual bool insertLine ( uint line, const TQString &text ) = 0; /** * Remove line(s) at the given line number. @@ -119,7 +119,7 @@ class KTEXTEDITOR_EXPORT EditInterface public: virtual void textChanged () = 0; - virtual void charactersInteractivelyInserted(int ,int ,const QString&)=0; //line, col, characters if you don't support this, don't create a signal, just overload it. + virtual void charactersInteractivelyInserted(int ,int ,const TQString&)=0; //line, col, characters if you don't support this, don't create a signal, just overload it. /** * only for the interface itself - REAL PRIVATE diff --git a/interfaces/ktexteditor/editinterfaceext.h b/interfaces/ktexteditor/editinterfaceext.h index f34ce80b9..650bb9ec2 100644 --- a/interfaces/ktexteditor/editinterfaceext.h +++ b/interfaces/ktexteditor/editinterfaceext.h @@ -20,7 +20,7 @@ #ifndef __ktexteditor_editinterfaceext_h__ #define __ktexteditor_editinterfaceext_h__ -#include <qstring.h> +#include <tqstring.h> #include <kdelibs_export.h> diff --git a/interfaces/ktexteditor/editor.h b/interfaces/ktexteditor/editor.h index 6f196d34e..11f9a8c15 100644 --- a/interfaces/ktexteditor/editor.h +++ b/interfaces/ktexteditor/editor.h @@ -46,7 +46,7 @@ class KTEXTEDITOR_EXPORT Editor : public KParts::ReadWritePart /** * Create a new editor widget. */ - Editor ( QObject *parent = 0, const char *name = 0 ); + Editor ( TQObject *parent = 0, const char *name = 0 ); virtual ~Editor (); unsigned int editorNumber () const; @@ -57,7 +57,7 @@ class KTEXTEDITOR_EXPORT Editor : public KParts::ReadWritePart unsigned int myEditorNumber; }; -KTEXTEDITOR_EXPORT Editor *createEditor ( const char* libname, QWidget *parentWidget = 0, const char *widgetName = 0, QObject *parent = 0, const char *name = 0 ); +KTEXTEDITOR_EXPORT Editor *createEditor ( const char* libname, TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0 ); } diff --git a/interfaces/ktexteditor/editorchooser.cpp b/interfaces/ktexteditor/editorchooser.cpp index a7211ab49..96cf3649e 100644 --- a/interfaces/ktexteditor/editorchooser.cpp +++ b/interfaces/ktexteditor/editorchooser.cpp @@ -1,15 +1,15 @@ #include <editorchooser.h> #include <editorchooser.moc> -#include <qcombobox.h> +#include <tqcombobox.h> #include <ktrader.h> #include <kconfig.h> -#include <qstringlist.h> +#include <tqstringlist.h> #include <kservice.h> #include <klocale.h> -#include <qlabel.h> +#include <tqlabel.h> #include <kapplication.h> -#include <qlayout.h> +#include <tqlayout.h> #include "editorchooser_ui.h" @@ -26,19 +26,19 @@ namespace KTextEditor ~PrivateEditorChooser(){} // Data Members EditorChooser_UI *chooser; - QStringList ElementNames; - QStringList elements; + TQStringList ElementNames; + TQStringList elements; }; } -EditorChooser::EditorChooser(QWidget *parent,const char *name) : - QWidget (parent,name) +EditorChooser::EditorChooser(TQWidget *parent,const char *name) : + TQWidget (parent,name) { d = new PrivateEditorChooser (); // sizemanagment - QGridLayout *grid = new QGridLayout( this, 1, 1 ); + TQGridLayout *grid = new TQGridLayout( this, 1, 1 ); d->chooser = new EditorChooser_UI (this, name); @@ -49,7 +49,7 @@ EditorChooser::EditorChooser(QWidget *parent,const char *name) : KTrader::OfferList offers = KTrader::self()->query("text/plain", "'KTextEditor/Document' in ServiceTypes"); KConfig *config=new KConfig("default_components"); config->setGroup("KTextEditor"); - QString editor = config->readPathEntry("embeddedEditor"); + TQString editor = config->readPathEntry("embeddedEditor"); if (editor.isEmpty()) editor="katepart"; @@ -74,11 +74,11 @@ EditorChooser:: ~EditorChooser(){ delete d; } -void EditorChooser::readAppSetting(const QString& postfix){ +void EditorChooser::readAppSetting(const TQString& postfix){ KConfig *cfg=kapp->config(); - QString previousGroup=cfg->group(); + TQString previousGroup=cfg->group(); cfg->setGroup("KTEXTEDITOR:"+postfix); - QString editor=cfg->readPathEntry("editor"); + TQString editor=cfg->readPathEntry("editor"); if (editor.isEmpty()) d->chooser->editorCombo->setCurrentItem(0); else { @@ -89,26 +89,26 @@ void EditorChooser::readAppSetting(const QString& postfix){ cfg->setGroup(previousGroup); } -void EditorChooser::writeAppSetting(const QString& postfix){ +void EditorChooser::writeAppSetting(const TQString& postfix){ KConfig *cfg=kapp->config(); - QString previousGroup=cfg->group(); + TQString previousGroup=cfg->group(); cfg->setGroup("KTEXTEDITOR:"+postfix); cfg->writeEntry("DEVELOPER_INFO","NEVER TRY TO USE VALUES FROM THAT GROUP, THEY ARE SUBJECT TO CHANGES"); cfg->writePathEntry("editor", (d->chooser->editorCombo->currentItem()==0) ? - QString::null : (*d->elements.at(d->chooser->editorCombo->currentItem()-1))); + TQString::null : (*d->elements.at(d->chooser->editorCombo->currentItem()-1))); cfg->sync(); cfg->setGroup(previousGroup); } -KTextEditor::Document *EditorChooser::createDocument(QObject *parent,const char* name, const QString& postfix,bool fallBackToKatePart){ +KTextEditor::Document *EditorChooser::createDocument(TQObject *parent,const char* name, const TQString& postfix,bool fallBackToKatePart){ KTextEditor::Document *tmpDoc=0; KConfig *cfg=kapp->config(); - QString previousGroup=cfg->group(); + TQString previousGroup=cfg->group(); cfg->setGroup("KTEXTEDITOR:"+postfix); - QString editor=cfg->readPathEntry("editor"); + TQString editor=cfg->readPathEntry("editor"); cfg->setGroup(previousGroup); if (editor.isEmpty()) { @@ -130,15 +130,15 @@ KTextEditor::Document *EditorChooser::createDocument(QObject *parent,const char* return 0; } -KTextEditor::Editor *EditorChooser::createEditor(QWidget *parentWidget,QObject *parent,const char* widgetName, - const char* name,const QString& postfix,bool fallBackToKatePart){ +KTextEditor::Editor *EditorChooser::createEditor(TQWidget *parentWidget,TQObject *parent,const char* widgetName, + const char* name,const TQString& postfix,bool fallBackToKatePart){ KTextEditor::Editor *tmpEd=0; KConfig *cfg=kapp->config(); - QString previousGroup=cfg->group(); + TQString previousGroup=cfg->group(); cfg->setGroup("KTEXTEDITOR:"+postfix); - QString editor=cfg->readPathEntry("editor"); + TQString editor=cfg->readPathEntry("editor"); cfg->setGroup(previousGroup); if (editor.isEmpty()) { diff --git a/interfaces/ktexteditor/editorchooser.h b/interfaces/ktexteditor/editorchooser.h index 3feb73b62..156c49473 100644 --- a/interfaces/ktexteditor/editorchooser.h +++ b/interfaces/ktexteditor/editorchooser.h @@ -4,7 +4,7 @@ #include <ktexteditor/editor.h> #include <ktexteditor/document.h> -#include <qwidget.h> +#include <tqwidget.h> class KConfig; class QString; @@ -19,16 +19,16 @@ class KTEXTEDITOR_EXPORT EditorChooser: public QWidget Q_OBJECT public: - EditorChooser(QWidget *parent=0,const char *name=0); + EditorChooser(TQWidget *parent=0,const char *name=0); virtual ~EditorChooser(); /* void writeSysDefault();*/ - void readAppSetting(const QString& postfix=QString::null); - void writeAppSetting(const QString& postfix=QString::null); + void readAppSetting(const TQString& postfix=TQString::null); + void writeAppSetting(const TQString& postfix=TQString::null); - static KTextEditor::Document *createDocument(QObject* parent=0,const char *name=0,const QString& postfix=QString::null, bool fallBackToKatePart=true); - static KTextEditor::Editor *createEditor(QWidget *parentWidget,QObject *parent,const char* widgetName=0,const char* name=0,const QString& postfix=QString::null,bool fallBackToKatePart=true); + static KTextEditor::Document *createDocument(TQObject* parent=0,const char *name=0,const TQString& postfix=TQString::null, bool fallBackToKatePart=true); + static KTextEditor::Editor *createEditor(TQWidget *parentWidget,TQObject *parent,const char* widgetName=0,const char* name=0,const TQString& postfix=TQString::null,bool fallBackToKatePart=true); private: class PrivateEditorChooser *d; }; @@ -38,18 +38,18 @@ class EditorChooserBackEnd: public ComponentChooserPlugin { Q_OBJECT public: - EditorChooserBackEnd(QObject *parent=0, const char *name=0); + EditorChooserBackEnd(TQObject *parent=0, const char *name=0); virtual ~EditorChooserBackEnd(); - virtual QWidget *widget(QWidget *); - virtual const QStringList &choices(); + virtual TQWidget *widget(TQWidget *); + virtual const TQStringList &choices(); virtual void saveSettings(); - void readAppSetting(KConfig *cfg,const QString& postfix); - void writeAppSetting(KConfig *cfg,const QString& postfix); + void readAppSetting(KConfig *cfg,const TQString& postfix); + void writeAppSetting(KConfig *cfg,const TQString& postfix); public slots: - virtual void madeChoice(int pos,const QString &choice); + virtual void madeChoice(int pos,const TQString &choice); }; */ diff --git a/interfaces/ktexteditor/encodingdcopinterface.cpp b/interfaces/ktexteditor/encodingdcopinterface.cpp index adf369c6d..eb408c16e 100644 --- a/interfaces/ktexteditor/encodingdcopinterface.cpp +++ b/interfaces/ktexteditor/encodingdcopinterface.cpp @@ -18,11 +18,11 @@ uint EncodingDCOPInterface::encodingInterfaceNumber () { return m_parent->encodingInterfaceNumber (); } -void EncodingDCOPInterface::setEncoding (QString e) +void EncodingDCOPInterface::setEncoding (TQString e) { m_parent->setEncoding (e); } -QString EncodingDCOPInterface::encoding() +TQString EncodingDCOPInterface::encoding() { return m_parent->encoding(); } diff --git a/interfaces/ktexteditor/encodingdcopinterface.h b/interfaces/ktexteditor/encodingdcopinterface.h index b5996deee..38de4e0aa 100644 --- a/interfaces/ktexteditor/encodingdcopinterface.h +++ b/interfaces/ktexteditor/encodingdcopinterface.h @@ -3,8 +3,8 @@ #include <dcopobject.h> #include <dcopref.h> -#include <qstringlist.h> -#include <qcstring.h> +#include <tqstringlist.h> +#include <tqcstring.h> //#include "editdcopinterface.moc" namespace KTextEditor { @@ -34,8 +34,8 @@ namespace KTextEditor virtual ~EncodingDCOPInterface(); k_dcop: uint encodingInterfaceNumber (); - void setEncoding (QString e) ; - QString encoding(); + void setEncoding (TQString e) ; + TQString encoding(); private: EncodingInterface *m_parent; diff --git a/interfaces/ktexteditor/encodinginterface.cpp b/interfaces/ktexteditor/encodinginterface.cpp index b27204862..341847fb7 100644 --- a/interfaces/ktexteditor/encodinginterface.cpp +++ b/interfaces/ktexteditor/encodinginterface.cpp @@ -47,7 +47,7 @@ EncodingInterface::EncodingInterface() myEncodingInterfaceNumber = globalEncodingInterfaceNumber++; d = new PrivateEncodingInterface(); - ::QString name = "EncodingInterface#" + ::QString::number(myEncodingInterfaceNumber); + ::TQString name = "EncodingInterface#" + ::TQString::number(myEncodingInterfaceNumber); d->interface = new EncodingDCOPInterface(this, name.latin1()); } @@ -62,7 +62,7 @@ unsigned int EncodingInterface::encodingInterfaceNumber () const return myEncodingInterfaceNumber; } -void EncodingInterface::setEncodingInterfaceDCOPSuffix (const QCString &suffix) +void EncodingInterface::setEncodingInterfaceDCOPSuffix (const TQCString &suffix) { d->interface->setObjId ("EncodingInterface#"+suffix); } diff --git a/interfaces/ktexteditor/encodinginterface.h b/interfaces/ktexteditor/encodinginterface.h index 245090e2e..6bd01be38 100644 --- a/interfaces/ktexteditor/encodinginterface.h +++ b/interfaces/ktexteditor/encodinginterface.h @@ -41,14 +41,14 @@ class KTEXTEDITOR_EXPORT EncodingInterface unsigned int encodingInterfaceNumber () const; protected: - void setEncodingInterfaceDCOPSuffix (const QCString &suffix); + void setEncodingInterfaceDCOPSuffix (const TQCString &suffix); // // slots !!! // public: - virtual void setEncoding (const class QString &e) = 0; - virtual class QString encoding() const = 0; + virtual void setEncoding (const class TQString &e) = 0; + virtual class TQString encoding() const = 0; private: class PrivateEncodingInterface *d; diff --git a/interfaces/ktexteditor/highlightinginterface.cpp b/interfaces/ktexteditor/highlightinginterface.cpp index 8f0db5204..f606ab5c0 100644 --- a/interfaces/ktexteditor/highlightinginterface.cpp +++ b/interfaces/ktexteditor/highlightinginterface.cpp @@ -55,7 +55,7 @@ unsigned int HighlightingInterface::highlightingInterfaceNumber () const return myHighlightingInterfaceNumber; } -void HighlightingInterface::setHighlightingInterfaceDCOPSuffix (const QCString &/*suffix*/) +void HighlightingInterface::setHighlightingInterfaceDCOPSuffix (const TQCString &/*suffix*/) { //d->interface->setObjId ("HighlightingInterface#"+suffix); } diff --git a/interfaces/ktexteditor/highlightinginterface.h b/interfaces/ktexteditor/highlightinginterface.h index 08784085c..707665b5e 100644 --- a/interfaces/ktexteditor/highlightinginterface.h +++ b/interfaces/ktexteditor/highlightinginterface.h @@ -42,7 +42,7 @@ class KTEXTEDITOR_EXPORT HighlightingInterface unsigned int highlightingInterfaceNumber () const; protected: - void setHighlightingInterfaceDCOPSuffix (const QCString &suffix); + void setHighlightingInterfaceDCOPSuffix (const TQCString &suffix); // // slots !!! @@ -66,12 +66,12 @@ class KTEXTEDITOR_EXPORT HighlightingInterface /** * returns the name of the highlighting with number "mode" */ - virtual QString hlModeName (unsigned int mode) = 0; + virtual TQString hlModeName (unsigned int mode) = 0; /** * returns the sectionname of the highlighting with number "mode" */ - virtual QString hlModeSectionName (unsigned int mode) = 0; + virtual TQString hlModeSectionName (unsigned int mode) = 0; // // signals !!! diff --git a/interfaces/ktexteditor/ktexteditor.cpp b/interfaces/ktexteditor/ktexteditor.cpp index be92cdedb..0b50fdaeb 100644 --- a/interfaces/ktexteditor/ktexteditor.cpp +++ b/interfaces/ktexteditor/ktexteditor.cpp @@ -106,7 +106,7 @@ unsigned int Plugin::globalPluginNumber = 0; unsigned int PluginViewInterface::globalPluginViewInterfaceNumber = 0; unsigned int Editor::globalEditorNumber = 0; -Document::Document( QObject *parent, const char *name ) : KTextEditor::Editor (parent, name ) +Document::Document( TQObject *parent, const char *name ) : KTextEditor::Editor (parent, name ) { globalDocumentNumber++; myDocumentNumber = globalDocumentNumber; @@ -121,15 +121,15 @@ unsigned int Document::documentNumber () const return myDocumentNumber; } -QCString Document::documentDCOPSuffix () const +TQCString Document::documentDCOPSuffix () const { - QCString num; + TQCString num; num.setNum (documentNumber()); return num; } -View::View( Document *, QWidget *parent, const char *name ) : QWidget( parent, name ) +View::View( Document *, TQWidget *parent, const char *name ) : TQWidget( parent, name ) { globalViewNumber++; myViewNumber = globalViewNumber; @@ -144,16 +144,16 @@ unsigned int View::viewNumber () const return myViewNumber; } -QCString View::viewDCOPSuffix () const +TQCString View::viewDCOPSuffix () const { - QCString num1, num2; + TQCString num1, num2; num1.setNum (viewNumber()); num2.setNum (document()->documentNumber()); return num2 + "-" + num1; } -Plugin::Plugin( Document *document, const char *name ) : QObject (document, name ) +Plugin::Plugin( Document *document, const char *name ) : TQObject (document, name ) { globalPluginNumber++; myPluginNumber = globalPluginNumber; @@ -191,7 +191,7 @@ unsigned int PluginViewInterface::pluginViewInterfaceNumber () const return myPluginViewInterfaceNumber; } -Editor::Editor( QObject *parent, const char *name ) : KParts::ReadWritePart( parent, name ) +Editor::Editor( TQObject *parent, const char *name ) : KParts::ReadWritePart( parent, name ) { globalEditorNumber++; myEditorNumber = globalEditorNumber; @@ -206,12 +206,12 @@ unsigned int Editor::editorNumber () const return myEditorNumber; } -Editor *KTextEditor::createEditor ( const char* libname, QWidget *parentWidget, const char *widgetName, QObject *parent, const char *name ) +Editor *KTextEditor::createEditor ( const char* libname, TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name ) { return KParts::ComponentFactory::createPartInstanceFromLibrary<Editor>( libname, parentWidget, widgetName, parent, name ); } -Document *KTextEditor::createDocument ( const char* libname, QObject *parent, const char *name ) +Document *KTextEditor::createDocument ( const char* libname, TQObject *parent, const char *name ) { return KParts::ComponentFactory::createPartInstanceFromLibrary<Document>( libname, 0, 0, parent, name ); } diff --git a/interfaces/ktexteditor/markinterface.cpp b/interfaces/ktexteditor/markinterface.cpp index 4b1127d9e..d711b5245 100644 --- a/interfaces/ktexteditor/markinterface.cpp +++ b/interfaces/ktexteditor/markinterface.cpp @@ -55,7 +55,7 @@ unsigned int MarkInterface::markInterfaceNumber () const return myMarkInterfaceNumber; } -void MarkInterface::setMarkInterfaceDCOPSuffix (const QCString &/*suffix*/) +void MarkInterface::setMarkInterfaceDCOPSuffix (const TQCString &/*suffix*/) { //d->interface->setObjId ("MarkInterface#"+suffix); } diff --git a/interfaces/ktexteditor/markinterface.h b/interfaces/ktexteditor/markinterface.h index 84e1a6758..7fbb03e00 100644 --- a/interfaces/ktexteditor/markinterface.h +++ b/interfaces/ktexteditor/markinterface.h @@ -20,7 +20,7 @@ #ifndef __ktexteditor_markinterface_h__ #define __ktexteditor_markinterface_h__ -#include <qptrlist.h> +#include <tqptrlist.h> #include <kdelibs_export.h> @@ -50,7 +50,7 @@ class KTEXTEDITOR_EXPORT MarkInterface unsigned int markInterfaceNumber () const; protected: - void setMarkInterfaceDCOPSuffix (const QCString &suffix); + void setMarkInterfaceDCOPSuffix (const TQCString &suffix); // // slots !!! @@ -80,7 +80,7 @@ class KTEXTEDITOR_EXPORT MarkInterface /** * @return a list of all marks in the document */ - virtual QPtrList<KTextEditor::Mark> marks () = 0; + virtual TQPtrList<KTextEditor::Mark> marks () = 0; /** * Clears all marks in the document. */ diff --git a/interfaces/ktexteditor/markinterfaceextension.cpp b/interfaces/ktexteditor/markinterfaceextension.cpp index 73f429fe8..57c981421 100644 --- a/interfaces/ktexteditor/markinterfaceextension.cpp +++ b/interfaces/ktexteditor/markinterfaceextension.cpp @@ -55,7 +55,7 @@ unsigned int MarkInterfaceExtension::markInterfaceExtensionNumber () const return myMarkInterfaceExtensionNumber; } -void MarkInterfaceExtension::setMarkInterfaceExtensionDCOPSuffix (const QCString &/*suffix*/) +void MarkInterfaceExtension::setMarkInterfaceExtensionDCOPSuffix (const TQCString &/*suffix*/) { //d->interface->setObjId ("MarkInterfaceExtension#"+suffix); } diff --git a/interfaces/ktexteditor/markinterfaceextension.h b/interfaces/ktexteditor/markinterfaceextension.h index cebe150f3..984664315 100644 --- a/interfaces/ktexteditor/markinterfaceextension.h +++ b/interfaces/ktexteditor/markinterfaceextension.h @@ -20,9 +20,9 @@ #ifndef __ktexteditor_markinterface_extension_h__ #define __ktexteditor_markinterface_extension_h__ -#include <qptrlist.h> -#include <qpixmap.h> -#include <qstring.h> +#include <tqptrlist.h> +#include <tqpixmap.h> +#include <tqstring.h> #include "markinterface.h" class QCString; @@ -47,11 +47,11 @@ class KTEXTEDITOR_EXPORT MarkInterfaceExtension unsigned int markInterfaceExtensionNumber () const; protected: - void setMarkInterfaceExtensionDCOPSuffix (const QCString &suffix); + void setMarkInterfaceExtensionDCOPSuffix (const TQCString &suffix); public: - virtual void setPixmap(MarkInterface::MarkTypes, const QPixmap &)=0; - virtual void setDescription(MarkInterface::MarkTypes, const QString &)=0; + virtual void setPixmap(MarkInterface::MarkTypes, const TQPixmap &)=0; + virtual void setDescription(MarkInterface::MarkTypes, const TQString &)=0; virtual void setMarksUserChangable(uint markMask)=0; enum MarkChangeAction { diff --git a/interfaces/ktexteditor/plugin.h b/interfaces/ktexteditor/plugin.h index f96e50ddd..dc7978f92 100644 --- a/interfaces/ktexteditor/plugin.h +++ b/interfaces/ktexteditor/plugin.h @@ -19,7 +19,7 @@ #ifndef __ktexteditor_plugin_h__ #define __ktexteditor_plugin_h__ -#include <qobject.h> +#include <tqobject.h> #include <kdelibs_export.h> diff --git a/interfaces/ktexteditor/popupmenuinterface.cpp b/interfaces/ktexteditor/popupmenuinterface.cpp index 30fe4303f..d2d51e4af 100644 --- a/interfaces/ktexteditor/popupmenuinterface.cpp +++ b/interfaces/ktexteditor/popupmenuinterface.cpp @@ -55,7 +55,7 @@ unsigned int PopupMenuInterface::popupMenuInterfaceNumber () const return myPopupMenuInterfaceNumber; } -void PopupMenuInterface::setPopupMenuInterfaceDCOPSuffix (const QCString &/*suffix*/) +void PopupMenuInterface::setPopupMenuInterfaceDCOPSuffix (const TQCString &/*suffix*/) { //d->interface->setObjId ("PopupMenuInterface#"+suffix); } diff --git a/interfaces/ktexteditor/popupmenuinterface.h b/interfaces/ktexteditor/popupmenuinterface.h index f1d07b806..4288cd605 100644 --- a/interfaces/ktexteditor/popupmenuinterface.h +++ b/interfaces/ktexteditor/popupmenuinterface.h @@ -41,7 +41,7 @@ class KTEXTEDITOR_EXPORT PopupMenuInterface unsigned int popupMenuInterfaceNumber () const; protected: - void setPopupMenuInterfaceDCOPSuffix (const QCString &suffix); + void setPopupMenuInterfaceDCOPSuffix (const TQCString &suffix); // // normal methodes @@ -51,7 +51,7 @@ class KTEXTEDITOR_EXPORT PopupMenuInterface Install a Popup Menu. The Popup Menu will be activated on a right mouse button press event. */ - virtual void installPopup (QPopupMenu *rmb_Menu) = 0; + virtual void installPopup (TQPopupMenu *rmb_Menu) = 0; private: class PrivatePopupMenuInterface *d; diff --git a/interfaces/ktexteditor/printdcopinterface.h b/interfaces/ktexteditor/printdcopinterface.h index 420def4cc..e41e6da5d 100644 --- a/interfaces/ktexteditor/printdcopinterface.h +++ b/interfaces/ktexteditor/printdcopinterface.h @@ -3,8 +3,8 @@ #include <dcopobject.h> #include <dcopref.h> -#include <qstringlist.h> -#include <qcstring.h> +#include <tqstringlist.h> +#include <tqcstring.h> //#include "editdcopinterface.moc" namespace KTextEditor { diff --git a/interfaces/ktexteditor/printinterface.cpp b/interfaces/ktexteditor/printinterface.cpp index 655e610bb..936e803ea 100644 --- a/interfaces/ktexteditor/printinterface.cpp +++ b/interfaces/ktexteditor/printinterface.cpp @@ -45,7 +45,7 @@ PrintInterface::PrintInterface() myPrintInterfaceNumber = globalPrintInterfaceNumber++; d = new PrivatePrintInterface(); - QString name = "PrintInterface#" + QString::number(myPrintInterfaceNumber); + TQString name = "PrintInterface#" + TQString::number(myPrintInterfaceNumber); d->interface = new PrintDCOPInterface(this, name.latin1()); } @@ -60,7 +60,7 @@ unsigned int PrintInterface::printInterfaceNumber () const return myPrintInterfaceNumber; } -void PrintInterface::setPrintInterfaceDCOPSuffix (const QCString &suffix) +void PrintInterface::setPrintInterfaceDCOPSuffix (const TQCString &suffix) { d->interface->setObjId ("PrintInterface#"+suffix); } diff --git a/interfaces/ktexteditor/printinterface.h b/interfaces/ktexteditor/printinterface.h index a2af1d0c4..758a64f7a 100644 --- a/interfaces/ktexteditor/printinterface.h +++ b/interfaces/ktexteditor/printinterface.h @@ -41,7 +41,7 @@ class KTEXTEDITOR_EXPORT PrintInterface unsigned int printInterfaceNumber () const; protected: - void setPrintInterfaceDCOPSuffix (const QCString &suffix); + void setPrintInterfaceDCOPSuffix (const TQCString &suffix); // // slots !!! diff --git a/interfaces/ktexteditor/searchdcopinterface.cpp b/interfaces/ktexteditor/searchdcopinterface.cpp index ce4fe516d..ce29e4927 100644 --- a/interfaces/ktexteditor/searchdcopinterface.cpp +++ b/interfaces/ktexteditor/searchdcopinterface.cpp @@ -2,7 +2,7 @@ #include "searchinterface.h" #include <dcopclient.h> -#include <qregexp.h> +#include <tqregexp.h> using namespace KTextEditor; @@ -20,16 +20,16 @@ SearchDCOPInterface::~SearchDCOPInterface() } -bool SearchDCOPInterface::findFirstString( QString text, bool caseSensitive) +bool SearchDCOPInterface::findFirstString( TQString text, bool caseSensitive) { return m_parent->searchText(0, 0, text, &m_currentrow, &m_currentcol, &m_currentmatchlen, caseSensitive); } -bool SearchDCOPInterface::findNextString( QString text, bool caseSensitive) +bool SearchDCOPInterface::findNextString( TQString text, bool caseSensitive) { return m_parent->searchText(m_currentrow, m_currentcol+1, text, &m_currentrow, &m_currentcol, &m_currentmatchlen, caseSensitive); } -bool SearchDCOPInterface::findPreviousString( QString text, bool caseSensitive) +bool SearchDCOPInterface::findPreviousString( TQString text, bool caseSensitive) { if( m_currentcol == 0) m_currentrow--; @@ -38,45 +38,45 @@ bool SearchDCOPInterface::findPreviousString( QString text, bool caseSensitive) return m_parent->searchText(m_currentrow, m_currentcol, text, &m_currentrow, &m_currentcol, &m_currentmatchlen, caseSensitive, true); } -bool SearchDCOPInterface::findLastString( QString text, bool caseSensitive) +bool SearchDCOPInterface::findLastString( TQString text, bool caseSensitive) { return m_parent->searchText(0,0, text, &m_currentrow, &m_currentcol, &m_currentmatchlen, caseSensitive, true); } -bool SearchDCOPInterface::findStringAt( uint row, uint col, QString text, bool caseSensitive) +bool SearchDCOPInterface::findStringAt( uint row, uint col, TQString text, bool caseSensitive) { return m_parent->searchText(row,col, text, &m_currentrow, &m_currentcol, &m_currentmatchlen, caseSensitive); } -bool SearchDCOPInterface::findFirstRegExp( QString regexp) +bool SearchDCOPInterface::findFirstRegExp( TQString regexp) { - return m_parent->searchText( 0,0, QRegExp(regexp), &m_currentrow, &m_currentcol, &m_currentmatchlen); + return m_parent->searchText( 0,0, TQRegExp(regexp), &m_currentrow, &m_currentcol, &m_currentmatchlen); } -bool SearchDCOPInterface::findNextRegExp( QString regexp) +bool SearchDCOPInterface::findNextRegExp( TQString regexp) { - return m_parent->searchText( m_currentrow, m_currentcol+1, QRegExp(regexp), &m_currentrow, &m_currentcol, &m_currentmatchlen); + return m_parent->searchText( m_currentrow, m_currentcol+1, TQRegExp(regexp), &m_currentrow, &m_currentcol, &m_currentmatchlen); } -bool SearchDCOPInterface::findPreviousRegExp( QString regexp) +bool SearchDCOPInterface::findPreviousRegExp( TQString regexp) { if( m_currentcol == 0) m_currentrow--; else m_currentcol--; - return m_parent->searchText( m_currentrow, m_currentcol, QRegExp(regexp), &m_currentrow, &m_currentcol, &m_currentmatchlen, true); + return m_parent->searchText( m_currentrow, m_currentcol, TQRegExp(regexp), &m_currentrow, &m_currentcol, &m_currentmatchlen, true); } -bool SearchDCOPInterface::findLastRegExp(QString regexp) +bool SearchDCOPInterface::findLastRegExp(TQString regexp) { - return m_parent->searchText( 0,0, QRegExp(regexp), &m_currentrow, &m_currentcol, &m_currentmatchlen, true); + return m_parent->searchText( 0,0, TQRegExp(regexp), &m_currentrow, &m_currentcol, &m_currentmatchlen, true); } -bool SearchDCOPInterface::findRegExpAt( uint row, uint col, QString regexp) +bool SearchDCOPInterface::findRegExpAt( uint row, uint col, TQString regexp) { - return m_parent->searchText( row, col, QRegExp(regexp), &m_currentrow, &m_currentcol, &m_currentmatchlen, false); + return m_parent->searchText( row, col, TQRegExp(regexp), &m_currentrow, &m_currentcol, &m_currentmatchlen, false); } uint SearchDCOPInterface::currentMatchLine() diff --git a/interfaces/ktexteditor/searchdcopinterface.h b/interfaces/ktexteditor/searchdcopinterface.h index a16af1bd6..d4f558a26 100644 --- a/interfaces/ktexteditor/searchdcopinterface.h +++ b/interfaces/ktexteditor/searchdcopinterface.h @@ -3,8 +3,8 @@ #include <dcopobject.h> #include <dcopref.h> -#include <qstringlist.h> -#include <qcstring.h> +#include <tqstringlist.h> +#include <tqcstring.h> namespace KTextEditor { @@ -33,17 +33,17 @@ namespace KTextEditor **/ virtual ~SearchDCOPInterface(); k_dcop: - bool findFirstString(QString text, bool caseSensitive); - bool findNextString(QString text, bool caseSensitive); - bool findPreviousString( QString text, bool caseSensitive); - bool findLastString(QString text, bool caseSensitive); - bool findStringAt( uint row, uint col, QString text, bool caseSensitive); + bool findFirstString(TQString text, bool caseSensitive); + bool findNextString(TQString text, bool caseSensitive); + bool findPreviousString( TQString text, bool caseSensitive); + bool findLastString(TQString text, bool caseSensitive); + bool findStringAt( uint row, uint col, TQString text, bool caseSensitive); - bool findFirstRegExp( QString regexp); - bool findNextRegExp( QString regexp); - bool findPreviousRegExp( QString regexp); - bool findLastRegExp( QString regexp); - bool findRegExpAt( uint row, uint col, QString regexp); + bool findFirstRegExp( TQString regexp); + bool findNextRegExp( TQString regexp); + bool findPreviousRegExp( TQString regexp); + bool findLastRegExp( TQString regexp); + bool findRegExpAt( uint row, uint col, TQString regexp); uint currentMatchLine(); uint currentMatchCol(); diff --git a/interfaces/ktexteditor/searchinterface.cpp b/interfaces/ktexteditor/searchinterface.cpp index 738567e87..d23a25e31 100644 --- a/interfaces/ktexteditor/searchinterface.cpp +++ b/interfaces/ktexteditor/searchinterface.cpp @@ -27,7 +27,7 @@ SearchInterface::SearchInterface() d = new PrivateSearchInterface(); globalSearchInterfaceNumber++; mySearchInterfaceNumber=globalSearchInterfaceNumber; - QString name = "SearchInterface#" + QString::number(mySearchInterfaceNumber); + TQString name = "SearchInterface#" + TQString::number(mySearchInterfaceNumber); d->interface = new SearchDCOPInterface(this, name.latin1()); } SearchInterface::~SearchInterface() @@ -41,7 +41,7 @@ unsigned int SearchInterface::searchInterfaceNumber () const return mySearchInterfaceNumber; } -void SearchInterface::setSearchInterfaceDCOPSuffix (const QCString &suffix) +void SearchInterface::setSearchInterfaceDCOPSuffix (const TQCString &suffix) { d->interface->setObjId ("SearchInterface#"+suffix); } diff --git a/interfaces/ktexteditor/searchinterface.h b/interfaces/ktexteditor/searchinterface.h index 1fd6823d3..b1c5f5f9f 100644 --- a/interfaces/ktexteditor/searchinterface.h +++ b/interfaces/ktexteditor/searchinterface.h @@ -43,14 +43,14 @@ class KTEXTEDITOR_EXPORT SearchInterface unsigned int searchInterfaceNumber () const; protected: - void setSearchInterfaceDCOPSuffix (const QCString &suffix); + void setSearchInterfaceDCOPSuffix (const TQCString &suffix); // // slots !!! // public: - virtual bool searchText (unsigned int startLine, unsigned int startCol, const QString &text, unsigned int *foundAtLine, unsigned int *foundAtCol, unsigned int *matchLen, bool casesensitive = true, bool backwards = false) = 0; - virtual bool searchText (unsigned int startLine, unsigned int startCol, const QRegExp ®exp, unsigned int *foundAtLine, unsigned int *foundAtCol, unsigned int *matchLen, bool backwards = false) = 0; + virtual bool searchText (unsigned int startLine, unsigned int startCol, const TQString &text, unsigned int *foundAtLine, unsigned int *foundAtCol, unsigned int *matchLen, bool casesensitive = true, bool backwards = false) = 0; + virtual bool searchText (unsigned int startLine, unsigned int startCol, const TQRegExp ®exp, unsigned int *foundAtLine, unsigned int *foundAtCol, unsigned int *matchLen, bool backwards = false) = 0; private: class PrivateSearchInterface *d; diff --git a/interfaces/ktexteditor/selectiondcopinterface.cpp b/interfaces/ktexteditor/selectiondcopinterface.cpp index c1405ae16..f341297e0 100644 --- a/interfaces/ktexteditor/selectiondcopinterface.cpp +++ b/interfaces/ktexteditor/selectiondcopinterface.cpp @@ -40,9 +40,9 @@ SelectionDCOPInterface::~SelectionDCOPInterface() } /** - * @return a QString for the selected text + * @return a TQString for the selected text */ - QString SelectionDCOPInterface::selection () + TQString SelectionDCOPInterface::selection () { return m_parent->selection(); } diff --git a/interfaces/ktexteditor/selectiondcopinterface.h b/interfaces/ktexteditor/selectiondcopinterface.h index 87efc1918..aa2973540 100644 --- a/interfaces/ktexteditor/selectiondcopinterface.h +++ b/interfaces/ktexteditor/selectiondcopinterface.h @@ -3,8 +3,8 @@ #include <dcopobject.h> #include <dcopref.h> -#include <qstringlist.h> -#include <qcstring.h> +#include <tqstringlist.h> +#include <tqcstring.h> namespace KTextEditor { @@ -49,9 +49,9 @@ namespace KTextEditor bool hasSelection (); /** - * @return a QString for the selected text + * @return a TQString for the selected text */ - QString selection (); + TQString selection (); /** * removes the selected Text diff --git a/interfaces/ktexteditor/selectionextdcopinterface.h b/interfaces/ktexteditor/selectionextdcopinterface.h index 65e7529ab..5c3e32baf 100644 --- a/interfaces/ktexteditor/selectionextdcopinterface.h +++ b/interfaces/ktexteditor/selectionextdcopinterface.h @@ -24,7 +24,7 @@ #include "selectioninterfaceext.h" -#include <qstring.h> +#include <tqstring.h> #include <dcopobject.h> #include <dcopref.h> diff --git a/interfaces/ktexteditor/selectioninterface.cpp b/interfaces/ktexteditor/selectioninterface.cpp index d568881d4..2e9ae5204 100644 --- a/interfaces/ktexteditor/selectioninterface.cpp +++ b/interfaces/ktexteditor/selectioninterface.cpp @@ -28,7 +28,7 @@ SelectionInterface::SelectionInterface() d = new PrivateSelectionInterface(); globalSelectionInterfaceNumber++; mySelectionInterfaceNumber = globalSelectionInterfaceNumber; - QString name = "SelectionInterface#" + QString::number(mySelectionInterfaceNumber); + TQString name = "SelectionInterface#" + TQString::number(mySelectionInterfaceNumber); d->interface = new SelectionDCOPInterface(this, name.latin1()); } SelectionInterface::~SelectionInterface() @@ -42,7 +42,7 @@ unsigned int SelectionInterface::selectionInterfaceNumber () const return mySelectionInterfaceNumber; } -void SelectionInterface::setSelectionInterfaceDCOPSuffix (const QCString &suffix) +void SelectionInterface::setSelectionInterfaceDCOPSuffix (const TQCString &suffix) { d->interface->setObjId ("SelectionInterface#"+suffix); } diff --git a/interfaces/ktexteditor/selectioninterface.h b/interfaces/ktexteditor/selectioninterface.h index 48931a02b..adcf7d5e2 100644 --- a/interfaces/ktexteditor/selectioninterface.h +++ b/interfaces/ktexteditor/selectioninterface.h @@ -20,7 +20,7 @@ #ifndef __ktexteditor_selectioninterface_h__ #define __ktexteditor_selectioninterface_h__ -#include <qstring.h> +#include <tqstring.h> #include <kdelibs_export.h> @@ -41,7 +41,7 @@ class KTEXTEDITOR_EXPORT SelectionInterface unsigned int selectionInterfaceNumber () const; protected: - void setSelectionInterfaceDCOPSuffix (const QCString &suffix); + void setSelectionInterfaceDCOPSuffix (const TQCString &suffix); /* * slots !!! @@ -63,9 +63,9 @@ class KTEXTEDITOR_EXPORT SelectionInterface virtual bool hasSelection () const = 0; /** - * @return a QString for the selected text + * @return a TQString for the selected text */ - virtual QString selection () const = 0; + virtual TQString selection () const = 0; /** * removes the selected Text diff --git a/interfaces/ktexteditor/selectioninterfaceext.cpp b/interfaces/ktexteditor/selectioninterfaceext.cpp index 471cfad65..f59468c17 100644 --- a/interfaces/ktexteditor/selectioninterfaceext.cpp +++ b/interfaces/ktexteditor/selectioninterfaceext.cpp @@ -43,7 +43,7 @@ SelectionInterfaceExt::SelectionInterfaceExt() { globalSelectionInterfaceExtNumber++; mySelectionInterfaceExtNumber = globalSelectionInterfaceExtNumber; - QString name = "SelectionInterfaceExt#" + QString::number(mySelectionInterfaceExtNumber); + TQString name = "SelectionInterfaceExt#" + TQString::number(mySelectionInterfaceExtNumber); d->interface = new SelectionExtDCOPInterface(this, name.latin1()); } @@ -58,7 +58,7 @@ unsigned int SelectionInterfaceExt::selectionInterfaceExtNumber () const return mySelectionInterfaceExtNumber; } -void SelectionInterfaceExt::setSelectionInterfaceExtDCOPSuffix (const QCString &suffix) +void SelectionInterfaceExt::setSelectionInterfaceExtDCOPSuffix (const TQCString &suffix) { d->interface->setObjId ("SelectionInterfaceExt#"+suffix); } diff --git a/interfaces/ktexteditor/selectioninterfaceext.h b/interfaces/ktexteditor/selectioninterfaceext.h index 6b033ff34..407717ffd 100644 --- a/interfaces/ktexteditor/selectioninterfaceext.h +++ b/interfaces/ktexteditor/selectioninterfaceext.h @@ -46,7 +46,7 @@ class KTEXTEDITOR_EXPORT SelectionInterfaceExt unsigned int selectionInterfaceExtNumber () const; protected: - void setSelectionInterfaceExtDCOPSuffix (const QCString &suffix); + void setSelectionInterfaceExtDCOPSuffix (const TQCString &suffix); public: /** The selection start line number */ diff --git a/interfaces/ktexteditor/sessionconfiginterface.cpp b/interfaces/ktexteditor/sessionconfiginterface.cpp index be159bb4d..7180aae38 100644 --- a/interfaces/ktexteditor/sessionconfiginterface.cpp +++ b/interfaces/ktexteditor/sessionconfiginterface.cpp @@ -58,7 +58,7 @@ unsigned int SessionConfigInterface::configInterfaceNumber () const return mySessionConfigInterfaceNumber; } -void SessionConfigInterface::setSessionConfigInterfaceDCOPSuffix (const QCString &/*suffix*/) +void SessionConfigInterface::setSessionConfigInterfaceDCOPSuffix (const TQCString &/*suffix*/) { //d->interface->setObjId ("SessionConfigInterface#"+suffix); } diff --git a/interfaces/ktexteditor/sessionconfiginterface.h b/interfaces/ktexteditor/sessionconfiginterface.h index fe392559b..5322d9f93 100644 --- a/interfaces/ktexteditor/sessionconfiginterface.h +++ b/interfaces/ktexteditor/sessionconfiginterface.h @@ -42,7 +42,7 @@ class KTEXTEDITOR_EXPORT SessionConfigInterface unsigned int configInterfaceNumber () const; protected: - void setSessionConfigInterfaceDCOPSuffix (const QCString &suffix); + void setSessionConfigInterfaceDCOPSuffix (const TQCString &suffix); // // slots !!! diff --git a/interfaces/ktexteditor/templateinterface.cpp b/interfaces/ktexteditor/templateinterface.cpp index 3a96a8d5a..4f9f83706 100644 --- a/interfaces/ktexteditor/templateinterface.cpp +++ b/interfaces/ktexteditor/templateinterface.cpp @@ -21,11 +21,11 @@ #include <stdaddressbook.h> #include <addressee.h> #include <addresseedialog.h> -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> #include <kglobal.h> -#include <qdatetime.h> -#include <qregexp.h> +#include <tqdatetime.h> +#include <tqregexp.h> #include <kmessagebox.h> #include <kcalendarsystem.h> #include <unistd.h> @@ -49,7 +49,7 @@ uint TemplateInterface::templateInterfaceNumber () const return myTemplateInterfaceNumber; } -void TemplateInterface::setTemplateInterfaceDCOPSuffix ( const QCString &suffix ) +void TemplateInterface::setTemplateInterfaceDCOPSuffix ( const TQCString &suffix ) {} #define INITKABC do { \ @@ -70,18 +70,18 @@ void TemplateInterface::setTemplateInterfaceDCOPSuffix ( const QCString &suffix } \ } while(false) -bool TemplateInterface::expandMacros( QMap<QString, QString> &map, QWidget *parentWindow ) +bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget *parentWindow ) { KABC::StdAddressBook *addrBook = 0; KABC::Addressee userAddress; - QDateTime datetime = QDateTime::currentDateTime(); - QDate date = datetime.date(); - QTime time = datetime.time(); + TQDateTime datetime = TQDateTime::currentDateTime(); + TQDate date = datetime.date(); + TQTime time = datetime.time(); - QMap<QString,QString>::Iterator it; + TQMap<TQString,TQString>::Iterator it; for ( it = map.begin(); it != map.end(); ++it ) { - QString placeholder = it.key(); + TQString placeholder = it.key(); if ( map[ placeholder ].isEmpty() ) { if ( placeholder == "index" ) map[ placeholder ] = "i"; @@ -125,11 +125,11 @@ bool TemplateInterface::expandMacros( QMap<QString, QString> &map, QWidget *pare } else if ( placeholder == "month" ) { - map[ placeholder ] = QString::number( KGlobal::locale() ->calendar() ->month( date ) ); + map[ placeholder ] = TQString::number( KGlobal::locale() ->calendar() ->month( date ) ); } else if ( placeholder == "day" ) { - map[ placeholder ] = QString::number( KGlobal::locale() ->calendar() ->day( date ) ); + map[ placeholder ] = TQString::number( KGlobal::locale() ->calendar() ->day( date ) ); } else if ( placeholder == "hostname" ) { @@ -137,7 +137,7 @@ bool TemplateInterface::expandMacros( QMap<QString, QString> &map, QWidget *pare hostname[ 0 ] = 0; gethostname( hostname, 255 ); hostname[ 255 ] = 0; - map[ placeholder ] = QString::fromLocal8Bit( hostname ); + map[ placeholder ] = TQString::fromLocal8Bit( hostname ); } else if ( placeholder == "cursor" ) { @@ -149,11 +149,11 @@ bool TemplateInterface::expandMacros( QMap<QString, QString> &map, QWidget *pare return true; } -bool TemplateInterface::insertTemplateText ( uint line, uint column, const QString &templateString, const QMap<QString, QString> &initialValues, QWidget *parentWindow ) +bool TemplateInterface::insertTemplateText ( uint line, uint column, const TQString &templateString, const TQMap<TQString, TQString> &initialValues, TQWidget *parentWindow ) { - QMap<QString, QString> enhancedInitValues( initialValues ); + TQMap<TQString, TQString> enhancedInitValues( initialValues ); - QRegExp rx( "[$%]\\{([^}\\s]+)\\}" ); + TQRegExp rx( "[$%]\\{([^}\\s]+)\\}" ); rx.setMinimal( true ); int pos = 0; int opos = 0; @@ -172,7 +172,7 @@ bool TemplateInterface::insertTemplateText ( uint line, uint column, const QStri continue; } } - QString placeholder = rx.cap( 1 ); + TQString placeholder = rx.cap( 1 ); if ( ! enhancedInitValues.contains( placeholder ) ) enhancedInitValues[ placeholder ] = ""; diff --git a/interfaces/ktexteditor/templateinterface.h b/interfaces/ktexteditor/templateinterface.h index c4cbca6b7..ec864a5e4 100644 --- a/interfaces/ktexteditor/templateinterface.h +++ b/interfaces/ktexteditor/templateinterface.h @@ -19,9 +19,9 @@ #ifndef __ktexteditor_templateinterface_h__ #define __ktexteditor_templateinterface_h__ -#include <qstring.h> -#include <qmap.h> -#include <qwidget.h> +#include <tqstring.h> +#include <tqmap.h> +#include <tqwidget.h> #include <kdelibs_export.h> @@ -52,12 +52,12 @@ class KTEXTEDITOR_EXPORT TemplateInterface //should be named AbstractTemplateInt * @return true if all macros was sucessfully expanded * @see insertTemplateText for a list of supported macros */ - static bool expandMacros( QMap<QString, QString> &initialValues, QWidget *parentWindow ); + static bool expandMacros( TQMap<TQString, TQString> &initialValues, TQWidget *parentWindow ); uint templateInterfaceNumber () const; protected: - void setTemplateInterfaceDCOPSuffix (const QCString &suffix); + void setTemplateInterfaceDCOPSuffix (const TQCString &suffix); public: @@ -103,7 +103,7 @@ class KTEXTEDITOR_EXPORT TemplateInterface //should be named AbstractTemplateInt * If the editor supports some kind of smart indentation, the inserted code * should be layouted by the indenter. */ - bool insertTemplateText ( uint line, uint column, const QString &templateString, const QMap<QString,QString> &initialValues, QWidget *parentWindow=0); + bool insertTemplateText ( uint line, uint column, const TQString &templateString, const TQMap<TQString,TQString> &initialValues, TQWidget *parentWindow=0); protected: /** @@ -113,7 +113,7 @@ protected: * insertTemplateText above. * @return true if any text was inserted. */ - virtual bool insertTemplateTextImplementation ( uint line, uint column, const QString &templateString, const QMap<QString,QString> &initialValues, QWidget *parentWindow=0 )=0; + virtual bool insertTemplateTextImplementation ( uint line, uint column, const TQString &templateString, const TQMap<TQString,TQString> &initialValues, TQWidget *parentWindow=0 )=0; /** * only for the interface itself - REAL PRIVATE diff --git a/interfaces/ktexteditor/texthintinterface.h b/interfaces/ktexteditor/texthintinterface.h index 3b5f0476d..aba23e944 100644 --- a/interfaces/ktexteditor/texthintinterface.h +++ b/interfaces/ktexteditor/texthintinterface.h @@ -19,8 +19,8 @@ #ifndef __ktexteditor_texthintinterface_h__ #define __ktexteditor_texthintinterface_h__ -#include <qstring.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqstringlist.h> #include <kdelibs_export.h> @@ -64,7 +64,7 @@ public: * I you don't want a tooltip to be displayd set text to an emtpy string in a connected slot, * otherwise set text to the string you want the editor to display */ - virtual void needTextHint(int line, int col, QString &text)=0; + virtual void needTextHint(int line, int col, TQString &text)=0; private: class PrivateTextHintInterface *d; diff --git a/interfaces/ktexteditor/undodcopinterface.h b/interfaces/ktexteditor/undodcopinterface.h index ff184fea4..b1a217036 100644 --- a/interfaces/ktexteditor/undodcopinterface.h +++ b/interfaces/ktexteditor/undodcopinterface.h @@ -3,8 +3,8 @@ #include <dcopobject.h> #include <dcopref.h> -#include <qstringlist.h> -#include <qcstring.h> +#include <tqstringlist.h> +#include <tqcstring.h> //#include "editdcopinterface.moc" namespace KTextEditor { diff --git a/interfaces/ktexteditor/undointerface.cpp b/interfaces/ktexteditor/undointerface.cpp index b0319f9c2..d19a56deb 100644 --- a/interfaces/ktexteditor/undointerface.cpp +++ b/interfaces/ktexteditor/undointerface.cpp @@ -45,7 +45,7 @@ UndoInterface::UndoInterface() myUndoInterfaceNumber = globalUndoInterfaceNumber++; d = new PrivateUndoInterface(); - QString name = "UndoInterface#" + QString::number(myUndoInterfaceNumber); + TQString name = "UndoInterface#" + TQString::number(myUndoInterfaceNumber); d->interface = new UndoDCOPInterface(this, name.latin1()); } @@ -60,7 +60,7 @@ unsigned int UndoInterface::undoInterfaceNumber () const return myUndoInterfaceNumber; } -void UndoInterface::setUndoInterfaceDCOPSuffix (const QCString &suffix) +void UndoInterface::setUndoInterfaceDCOPSuffix (const TQCString &suffix) { d->interface->setObjId ("UndoInterface#"+suffix); } diff --git a/interfaces/ktexteditor/undointerface.h b/interfaces/ktexteditor/undointerface.h index 73146107e..e0fc77107 100644 --- a/interfaces/ktexteditor/undointerface.h +++ b/interfaces/ktexteditor/undointerface.h @@ -40,7 +40,7 @@ class KTEXTEDITOR_EXPORT UndoInterface unsigned int undoInterfaceNumber () const; protected: - void setUndoInterfaceDCOPSuffix (const QCString &suffix); + void setUndoInterfaceDCOPSuffix (const TQCString &suffix); // // slots !!! diff --git a/interfaces/ktexteditor/variableinterface.h b/interfaces/ktexteditor/variableinterface.h index 84ed6013e..3df389b09 100644 --- a/interfaces/ktexteditor/variableinterface.h +++ b/interfaces/ktexteditor/variableinterface.h @@ -50,7 +50,7 @@ class KTEXTEDITOR_EXPORT VariableInterface * @return the value of the variable @p name, or an empty string if the * variable is not set or has no value. */ - virtual QString variable( const QString &name ) const = 0; + virtual TQString variable( const TQString &name ) const = 0; // // signals!! @@ -59,7 +59,7 @@ class KTEXTEDITOR_EXPORT VariableInterface /** * Signal: emitted when a variable is set */ - virtual void variableChanged( const QString &variable, const QString &value ) = 0; + virtual void variableChanged( const TQString &variable, const TQString &value ) = 0; private: static unsigned int globalVariableInterfaceNumber; diff --git a/interfaces/ktexteditor/view.h b/interfaces/ktexteditor/view.h index e05dac5c7..caa14d021 100644 --- a/interfaces/ktexteditor/view.h +++ b/interfaces/ktexteditor/view.h @@ -19,7 +19,7 @@ #ifndef __ktexteditor_view_h__ #define __ktexteditor_view_h__ -#include <qwidget.h> +#include <tqwidget.h> #include <kxmlguiclient.h> namespace KTextEditor @@ -29,7 +29,7 @@ namespace KTextEditor * The View class represents a single view of a Document . */ -class KTEXTEDITOR_EXPORT View : public QWidget, public KXMLGUIClient +class KTEXTEDITOR_EXPORT View : public TQWidget, public KXMLGUIClient { friend class PrivateView; @@ -39,7 +39,7 @@ class KTEXTEDITOR_EXPORT View : public QWidget, public KXMLGUIClient /** * Create a new view to the given document. The document must be non-null. */ - View ( class Document *, QWidget *parent, const char *name = 0 ); + View ( class Document *, TQWidget *parent, const char *name = 0 ); virtual ~View (); /** @@ -50,7 +50,7 @@ class KTEXTEDITOR_EXPORT View : public QWidget, public KXMLGUIClient /** * Returns the DCOP suffix to allow identification of this view's DCOP interface. */ - QCString viewDCOPSuffix () const; + TQCString viewDCOPSuffix () const; /** * Acess the parent Document. diff --git a/interfaces/ktexteditor/viewcursordcopinterface.cpp b/interfaces/ktexteditor/viewcursordcopinterface.cpp index e6235ac9a..f26385414 100644 --- a/interfaces/ktexteditor/viewcursordcopinterface.cpp +++ b/interfaces/ktexteditor/viewcursordcopinterface.cpp @@ -1,7 +1,7 @@ #include "viewcursordcopinterface.h" #include "viewcursorinterface.h" -#include <qpoint.h> +#include <tqpoint.h> #include <dcopclient.h> using namespace KTextEditor; @@ -22,7 +22,7 @@ uint ViewCursorDCOPInterface::viewCursorInterfaceNumber () return m_parent->viewCursorInterfaceNumber (); } -::QPoint ViewCursorDCOPInterface::cursorCoordinates () +::TQPoint ViewCursorDCOPInterface::cursorCoordinates () { return m_parent->cursorCoordinates (); } diff --git a/interfaces/ktexteditor/viewcursordcopinterface.h b/interfaces/ktexteditor/viewcursordcopinterface.h index 9dd974a7d..4bae0b520 100644 --- a/interfaces/ktexteditor/viewcursordcopinterface.h +++ b/interfaces/ktexteditor/viewcursordcopinterface.h @@ -3,8 +3,8 @@ #include <dcopobject.h> #include <dcopref.h> -#include <qstringlist.h> -#include <qcstring.h> +#include <tqstringlist.h> +#include <tqcstring.h> //#include "editdcopinterface.moc" namespace KTextEditor { @@ -38,7 +38,7 @@ namespace KTextEditor /** * Get the current cursor coordinates in pixels. */ - class QPoint cursorCoordinates (); + class TQPoint cursorCoordinates (); /** * Get the cursor position diff --git a/interfaces/ktexteditor/viewcursorinterface.cpp b/interfaces/ktexteditor/viewcursorinterface.cpp index 5e9503984..0c834be42 100644 --- a/interfaces/ktexteditor/viewcursorinterface.cpp +++ b/interfaces/ktexteditor/viewcursorinterface.cpp @@ -45,7 +45,7 @@ ViewCursorInterface::ViewCursorInterface() myViewCursorInterfaceNumber = globalViewCursorInterfaceNumber++; d = new PrivateViewCursorInterface(); - QString name = "ViewCursorInterface#" + QString::number(myViewCursorInterfaceNumber); + TQString name = "ViewCursorInterface#" + TQString::number(myViewCursorInterfaceNumber); d->interface = new ViewCursorDCOPInterface(this, name.latin1()); } @@ -60,7 +60,7 @@ unsigned int ViewCursorInterface::viewCursorInterfaceNumber () const return myViewCursorInterfaceNumber; } -void ViewCursorInterface::setViewCursorInterfaceDCOPSuffix (const QCString &suffix) +void ViewCursorInterface::setViewCursorInterfaceDCOPSuffix (const TQCString &suffix) { d->interface->setObjId ("ViewCursorInterface#"+suffix); } diff --git a/interfaces/ktexteditor/viewcursorinterface.h b/interfaces/ktexteditor/viewcursorinterface.h index 05a427bae..0264f5177 100644 --- a/interfaces/ktexteditor/viewcursorinterface.h +++ b/interfaces/ktexteditor/viewcursorinterface.h @@ -41,7 +41,7 @@ class KTEXTEDITOR_EXPORT ViewCursorInterface unsigned int viewCursorInterfaceNumber () const; protected: - void setViewCursorInterfaceDCOPSuffix (const QCString &suffix); + void setViewCursorInterfaceDCOPSuffix (const TQCString &suffix); // // slots !!! @@ -50,7 +50,7 @@ class KTEXTEDITOR_EXPORT ViewCursorInterface /** * Get the current cursor coordinates in pixels. */ - virtual class QPoint cursorCoordinates () = 0; + virtual class TQPoint cursorCoordinates () = 0; /** * Get the cursor position diff --git a/interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp b/interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp index 4cd2c6c2d..d38b9b938 100644 --- a/interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp +++ b/interfaces/ktexteditor/viewstatusmsgdcopinterface.cpp @@ -1,7 +1,7 @@ #include "viewstatusmsgdcopinterface.h" #include "viewstatusmsginterface.h" -#include <qstring.h> +#include <tqstring.h> #include <dcopclient.h> using namespace KTextEditor; @@ -22,7 +22,7 @@ uint ViewStatusMsgDCOPInterface::viewStatusMsgInterfaceNumber () return m_parent->viewStatusMsgInterfaceNumber (); } -void ViewStatusMsgDCOPInterface::viewStatusMsg (QString msg) +void ViewStatusMsgDCOPInterface::viewStatusMsg (TQString msg) { m_parent->viewStatusMsg(msg); } diff --git a/interfaces/ktexteditor/viewstatusmsgdcopinterface.h b/interfaces/ktexteditor/viewstatusmsgdcopinterface.h index 45d5507d3..b4c5cf72e 100644 --- a/interfaces/ktexteditor/viewstatusmsgdcopinterface.h +++ b/interfaces/ktexteditor/viewstatusmsgdcopinterface.h @@ -3,8 +3,8 @@ #include <dcopobject.h> #include <dcopref.h> -#include <qstringlist.h> -#include <qcstring.h> +#include <tqstringlist.h> +#include <tqcstring.h> //#include "editdcopinterface.moc" namespace KTextEditor { @@ -34,7 +34,7 @@ namespace KTextEditor virtual ~ViewStatusMsgDCOPInterface(); k_dcop: uint viewStatusMsgInterfaceNumber (); - void viewStatusMsg (class QString msg) ; + void viewStatusMsg (class TQString msg) ; private: ViewStatusMsgInterface *m_parent; diff --git a/interfaces/ktexteditor/viewstatusmsginterface.cpp b/interfaces/ktexteditor/viewstatusmsginterface.cpp index d519678eb..ff0815c89 100644 --- a/interfaces/ktexteditor/viewstatusmsginterface.cpp +++ b/interfaces/ktexteditor/viewstatusmsginterface.cpp @@ -22,7 +22,7 @@ #include "viewstatusmsgdcopinterface.h" #include "view.h" -#include <qstring.h> +#include <tqstring.h> namespace KTextEditor { @@ -47,7 +47,7 @@ ViewStatusMsgInterface::ViewStatusMsgInterface() myViewStatusMsgInterfaceNumber = globalViewStatusMsgInterfaceNumber++; d = new PrivateViewStatusMsgInterface(); - ::QString name = "ViewStatusMsgInterface#" + ::QString::number(myViewStatusMsgInterfaceNumber); + ::TQString name = "ViewStatusMsgInterface#" + ::TQString::number(myViewStatusMsgInterfaceNumber); d->interface = new ViewStatusMsgDCOPInterface(this, name.latin1()); } @@ -62,7 +62,7 @@ unsigned int ViewStatusMsgInterface::viewStatusMsgInterfaceNumber () const return myViewStatusMsgInterfaceNumber; } -void ViewStatusMsgInterface::setViewStatusMsgInterfaceDCOPSuffix (const QCString &suffix) +void ViewStatusMsgInterface::setViewStatusMsgInterfaceDCOPSuffix (const TQCString &suffix) { d->interface->setObjId ("ViewStatusMsgInterface#"+suffix); } diff --git a/interfaces/ktexteditor/viewstatusmsginterface.h b/interfaces/ktexteditor/viewstatusmsginterface.h index 9c49cab1c..667494277 100644 --- a/interfaces/ktexteditor/viewstatusmsginterface.h +++ b/interfaces/ktexteditor/viewstatusmsginterface.h @@ -41,13 +41,13 @@ class KTEXTEDITOR_EXPORT ViewStatusMsgInterface unsigned int viewStatusMsgInterfaceNumber () const; protected: - void setViewStatusMsgInterfaceDCOPSuffix (const QCString &suffix); + void setViewStatusMsgInterfaceDCOPSuffix (const TQCString &suffix); // // signals !!! // public: - virtual void viewStatusMsg (const class QString &msg) = 0; + virtual void viewStatusMsg (const class TQString &msg) = 0; private: diff --git a/interfaces/ktexteditor/wordwrapinterface.cpp b/interfaces/ktexteditor/wordwrapinterface.cpp index 9bf01ecff..3afe5c230 100644 --- a/interfaces/ktexteditor/wordwrapinterface.cpp +++ b/interfaces/ktexteditor/wordwrapinterface.cpp @@ -56,7 +56,7 @@ unsigned int WordWrapInterface::wordWrapInterfaceNumber () const return myWordWrapInterfaceNumber; } -void WordWrapInterface::setWordWrapInterfaceDCOPSuffix (const QCString &/*suffix*/) +void WordWrapInterface::setWordWrapInterfaceDCOPSuffix (const TQCString &/*suffix*/) { //d->interface->setObjId ("WordWrapInterface#"+suffix); } diff --git a/interfaces/ktexteditor/wordwrapinterface.h b/interfaces/ktexteditor/wordwrapinterface.h index 81fbb2efa..0ececa7f5 100644 --- a/interfaces/ktexteditor/wordwrapinterface.h +++ b/interfaces/ktexteditor/wordwrapinterface.h @@ -41,7 +41,7 @@ class KTEXTEDITOR_EXPORT WordWrapInterface unsigned int wordWrapInterfaceNumber () const; protected: - void setWordWrapInterfaceDCOPSuffix (const QCString &suffix); + void setWordWrapInterfaceDCOPSuffix (const TQCString &suffix); // // slots !!! diff --git a/interfaces/terminal/kde_terminal_interface.h b/interfaces/terminal/kde_terminal_interface.h index a60c2d70c..c8d383205 100644 --- a/interfaces/terminal/kde_terminal_interface.h +++ b/interfaces/terminal/kde_terminal_interface.h @@ -32,11 +32,11 @@ class QStrList; * * Note that besides the functions below here, KonsolePart also has * some signals you can connect to. They aren't in this class cause - * we can't have signals without having a QObject, which + * we can't have signals without having a TQObject, which * TerminalInterface is not. * These are the signals you can connect to: * void processExited( KProcess *process ); - * void receivedData( const QString& s ); + * void receivedData( const TQString& s ); * See the example code below for how to connect to these.. * * The process provided by processExited() is obviously exited, @@ -54,7 +54,7 @@ class QStrList; * }; * // fetch the part.. * KParts::Part* p = static_cast<KParts::Part*>( - * factory->create( this, "tralala", "QObject", + * factory->create( this, "tralala", "TQObject", * "KParts::ReadOnlyPart" ) ); * assert( p ); * setCentralWidget( p->widget() ); @@ -71,16 +71,16 @@ class QStrList; * return; * }; * // now use the interface in all sorts of ways, e.g. - * // t->showShellInDir( QDir::home().path() ); + * // t->showShellInDir( TQDir::home().path() ); * // or: - * // QStrList l; + * // TQStrList l; * // l.append( "python" ); - * // t->startProgram( QString::fromUtf8( "/usr/bin/python" ), l); + * // t->startProgram( TQString::fromUtf8( "/usr/bin/python" ), l); * // or connect to one of the signals. Connect to the Part object, - * // not to the TerminalInterface, since the latter is no QObject, + * // not to the TerminalInterface, since the latter is no TQObject, * // and as such cannot have signals..: - * // connect( p, SIGNAL( processExited( int ) ), - * // this, SLOT( shellExited( int ) ) ); + * // connect( p, TQT_SIGNAL( processExited( int ) ), + * // this, TQT_SLOT( shellExited( int ) ) ); * // etc. * * \endcode @@ -95,20 +95,20 @@ public: /** * This starts @p program, with arguments @p args */ - virtual void startProgram( const QString& program, - const QStrList& args ) = 0; + virtual void startProgram( const TQString& program, + const TQStrList& args ) = 0; /** * If a shell is currently shown, this sends it a cd * command. Otherwise, this starts a shell, and sends it a cd * command too... */ - virtual void showShellInDir( const QString& dir ) = 0; + virtual void showShellInDir( const TQString& dir ) = 0; /** * This sends @param text as input to the currently running * program.. */ - virtual void sendInput( const QString& text ) = 0; + virtual void sendInput( const TQString& text ) = 0; }; @@ -132,20 +132,20 @@ public: /** * This starts @p program, with arguments @p args */ - virtual void startProgram( const QString& program, - const QStrList& args ) = 0; + virtual void startProgram( const TQString& program, + const TQStrList& args ) = 0; /** * If a shell is currently shown, this sends it a cd * command. Otherwise, this starts a shell, and sends it a cd * command too... */ - virtual void showShellInDir( const QString& dir ) = 0; + virtual void showShellInDir( const TQString& dir ) = 0; /** * This sends @param text as input to the currently running * program.. */ - virtual void sendInput( const QString& text ) = 0; + virtual void sendInput( const TQString& text ) = 0; /** Call this to disable the automatic shell that diff --git a/interfaces/terminal/test/main.cc b/interfaces/terminal/test/main.cc index 7d5859e57..be3f4165e 100644 --- a/interfaces/terminal/test/main.cc +++ b/interfaces/terminal/test/main.cc @@ -6,7 +6,7 @@ #include <kaboutdata.h> #include <kcmdlineargs.h> #include <kapplication.h> -#include <qdir.h> +#include <tqdir.h> #include <assert.h> #include <kmessagebox.h> #include <cassert> @@ -17,17 +17,17 @@ Win::Win() { KLibFactory* factory = KLibLoader::self()->factory( "libkonsolepart" ); assert( factory ); - KParts::Part* p = static_cast<KParts::Part*>( factory->create( this, "tralala", "QObject", "KParts::ReadOnlyPart" ) ); + KParts::Part* p = static_cast<KParts::Part*>( factory->create( this, "tralala", "TQObject", "KParts::ReadOnlyPart" ) ); setCentralWidget( p->widget() ); TerminalInterface* t = static_cast<TerminalInterface*>( p->qt_cast( "TerminalInterface" ) ); - t->showShellInDir( QDir::home().path() ); -// QStrList l; + t->showShellInDir( TQDir::home().path() ); +// TQStrList l; // l.append( "python" ); -// t->startProgram( QString::fromUtf8( "/usr/bin/python" ), l ); +// t->startProgram( TQString::fromUtf8( "/usr/bin/python" ), l ); - connect( p, SIGNAL( processExited( int ) ), - this, SLOT( pythonExited( int ) ) ); + connect( p, TQT_SIGNAL( processExited( int ) ), + this, TQT_SLOT( pythonExited( int ) ) ); } @@ -47,14 +47,14 @@ void Win::pythonExited() { std::cerr << "hee, " << p << std::endl; std::cerr << ( p->qt_cast( "TerminalInterface" ) ) << std::endl; - // KMessageBox::sorry( this, QString::fromUtf8( "Exited, status was %1" ).arg( status ) ); - disconnect(p, SIGNAL( processExited() ), - this, SLOT( pythonExited() )); + // KMessageBox::sorry( this, TQString::fromUtf8( "Exited, status was %1" ).arg( status ) ); + disconnect(p, TQT_SIGNAL( processExited() ), + this, TQT_SLOT( pythonExited() )); TerminalInterface* t = static_cast<TerminalInterface*>( p->qt_cast( "TerminalInterface" ) ); - QStrList l; + TQStrList l; l.append( "echo" ); l.append( "hello world" ); - t->startProgram( QString::fromUtf8( "/bin/echo" ), l ); + t->startProgram( TQString::fromUtf8( "/bin/echo" ), l ); } void Win::forked() |