diff options
Diffstat (limited to 'interfaces')
45 files changed, 99 insertions, 99 deletions
diff --git a/interfaces/khexedit/byteseditinterface.h b/interfaces/khexedit/byteseditinterface.h index 3bc5749d2..bfeaa43e5 100644 --- a/interfaces/khexedit/byteseditinterface.h +++ b/interfaces/khexedit/byteseditinterface.h @@ -206,7 +206,7 @@ inline BytesEditInterface *bytesEditInterface( T *t ) * � if( Clipboard ) * � { * � � // Yes, use BytesEditWidget, not Clipboard, because that's the TQObject, indeed hacky... - * � � connect( BytesEditWidget, TQT_SIGNAL(copyAvailable(bool)), this, TQT_SLOT(offerCopy(bool)) ); + * � � connect( BytesEditWidget, TQ_SIGNAL(copyAvailable(bool)), this, TQ_SLOT(offerCopy(bool)) ); * � } * } * \endcode @@ -221,7 +221,7 @@ inline BytesEditInterface *bytesEditInterface( T *t ) inline TQWidget *createBytesEditWidget( TQWidget *Parent = 0, const char *Name = 0 ) { return KParts::ComponentFactory::createInstanceFromQuery<TQWidget> - ( TQString::fromLatin1("KHexEdit/KBytesEdit"), TQString::null, TQT_TQOBJECT(Parent), Name ); + ( TQString::fromLatin1("KHexEdit/KBytesEdit"), TQString::null, Parent, Name ); } } diff --git a/interfaces/khexedit/clipboardinterface.h b/interfaces/khexedit/clipboardinterface.h index c63c5a88e..ec77b1a48 100644 --- a/interfaces/khexedit/clipboardinterface.h +++ b/interfaces/khexedit/clipboardinterface.h @@ -35,7 +35,7 @@ namespace KHE * if( Clipboard ) * { * � // Yes, use BytesEditWidget, not Clipboard, because that's the TQObject, indeed hacky... - * � connect( BytesEditWidget, TQT_SIGNAL(copyAvailable(bool)), this, TQT_SLOT(offerCopy(bool)) ); + * � connect( BytesEditWidget, TQ_SIGNAL(copyAvailable(bool)), this, TQ_SLOT(offerCopy(bool)) ); * } * \endcode * @@ -78,7 +78,7 @@ ClipboardInterface *clipboardInterface( T *t ) if( !t ) return 0; - return ::tqqt_cast<KHE::ClipboardInterface*>( t ); + return ::tqt_cast<KHE::ClipboardInterface*>( t ); } } diff --git a/interfaces/khexedit/zoominterface.h b/interfaces/khexedit/zoominterface.h index 9c6f0f677..21145cb9a 100644 --- a/interfaces/khexedit/zoominterface.h +++ b/interfaces/khexedit/zoominterface.h @@ -71,7 +71,7 @@ ZoomInterface *zoomInterface( T *t ) if( !t ) return 0; - return ::tqqt_cast<KHE::ZoomInterface*>( t ); + return ::tqt_cast<KHE::ZoomInterface*>( t ); } } diff --git a/interfaces/kregexpeditor/kregexpeditorinterface.h b/interfaces/kregexpeditor/kregexpeditorinterface.h index 4124849d6..fbdc22de6 100644 --- a/interfaces/kregexpeditor/kregexpeditorinterface.h +++ b/interfaces/kregexpeditor/kregexpeditorinterface.h @@ -25,7 +25,7 @@ * TQDialog *editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor" ); * if ( editorDialog ) { * // tdeutils was installed, so the dialog was found fetch the editor interface - * KRegExpEditorInterface *editor = ::tqqt_cast<KRegExpEditorInterface *>( editorDialog ); + * KRegExpEditorInterface *editor = ::tqt_cast<KRegExpEditorInterface *>( editorDialog ); * Q_ASSERT( editor ); // This should not fail! * * // now use the editor. @@ -41,7 +41,7 @@ * * Note: signals and slots must be connected to the editorDialog object, not to the editor object: * \code - * connect( editorDialog, TQT_SIGNAL( canUndo( bool ) ), undoBut, TQT_SLOT( setEnabled( bool ) ) ); + * connect( editorDialog, TQ_SIGNAL( canUndo( bool ) ), undoBut, TQ_SLOT( setEnabled( bool ) ) ); * \endcode * * If you want to create an instance of the editor widget, i.e. not the @@ -53,7 +53,7 @@ * "KRegExpEditor/KRegExpEditor", TQString::null, parent ); * if ( editorWidget ) { * // tdeutils was installed, so the widget was found fetch the editor interface - * KRegExpEditorInterface *editor = ::tqqt_cast<KRegExpEditorInterface *>( editorWidget ); + * KRegExpEditorInterface *editor = ::tqt_cast<KRegExpEditorInterface *>( editorWidget ); * Q_ASSERT( editor ); // This should not fail! * * // now use the editor. diff --git a/interfaces/kspeech/kspeech.h b/interfaces/kspeech/kspeech.h index c926b2602..0c541e9e2 100644 --- a/interfaces/kspeech/kspeech.h +++ b/interfaces/kspeech/kspeech.h @@ -306,11 +306,11 @@ * @verbatim // Register DCOP client. - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); if (!client->isRegistered()) { client->attach(); - client->registerAs(kapp->name()); + client->registerAs(tdeApp->name()); } // Connect KTTSD DCOP signals to our slots. connectDCOPSignal("kttsd", "KSpeech", diff --git a/interfaces/tdeimproxy/TODO b/interfaces/tdeimproxy/TODO index fc66130fe..6e215680a 100644 --- a/interfaces/tdeimproxy/TODO +++ b/interfaces/tdeimproxy/TODO @@ -1,10 +1,10 @@ For the future, the following modifications need to be done: Currently there is a function : - virtual QString presenceString( const QString & uid ) = 0; + virtual TQString presenceString( const TQString & uid ) = 0; This needs to be broken into: - virtual QString presenceString( const QString & uid ) = 0; - virtual QString presenceLongString( const QString & uid ) = 0; + virtual TQString presenceString( const TQString & uid ) = 0; + virtual TQString presenceLongString( const TQString & uid ) = 0; The former returning, say "Away", the latter returning the long away message. diff --git a/interfaces/tdeimproxy/interface/kimiface.h b/interfaces/tdeimproxy/interface/kimiface.h index 2591c3ce0..aacb4217b 100644 --- a/interfaces/tdeimproxy/interface/kimiface.h +++ b/interfaces/tdeimproxy/interface/kimiface.h @@ -57,12 +57,12 @@ * @endcode * and the class implementing KIMIface must pass "KIMIface" to the DCOPObject constructor: * @code - * // just need TQObject inheritance and Q_OBJECT if you want signals and slots + * // just need TQObject inheritance and TQ_OBJECT if you want signals and slots * // no need to use K_DCOP macro again * * class MyIMIface : public TQObject, public KIMIface * { - * Q_OBJECT + * TQ_OBJECT * public: * MyIMIface(TQObject* parent = 0, const char* name) : * DCOPObject("KIMIface"), // <-- passing the interface name as required diff --git a/interfaces/tdeimproxy/library/tdeimproxy.cpp b/interfaces/tdeimproxy/library/tdeimproxy.cpp index fb2db0eb4..627d66914 100644 --- a/interfaces/tdeimproxy/library/tdeimproxy.cpp +++ b/interfaces/tdeimproxy/library/tdeimproxy.cpp @@ -28,7 +28,7 @@ #include <kdcopservicestarter.h> #include <kdebug.h> #include <tdemessagebox.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kiconloader.h> #include <kservice.h> #include <kservicetype.h> @@ -181,8 +181,8 @@ KIMProxy::KIMProxy( DCOPClient* dc ) : DCOPObject( "KIMProxyIface" ), TQObject() d->dc = dc; m_initialized = false; - 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& ) ) ); + connect( d->dc, TQ_SIGNAL( applicationRemoved( const TQCString& ) ) , this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); + connect( d->dc, TQ_SIGNAL( applicationRegistered( const TQCString& ) ) , this, TQ_SLOT( registeredToDCOP( const TQCString& ) ) ); d->dc->setNotifications( true ); d->presence_strings.append( "Unknown" ); @@ -492,7 +492,7 @@ void KIMProxy::chatWithContact( const TQString& uid ) { if ( KIMIface_stub* s = stubForUid( uid ) ) { - kapp->updateRemoteUserTimestamp( s->app() ); + tdeApp->updateRemoteUserTimestamp( s->app() ); s->chatWithContact( uid ); } } @@ -505,7 +505,7 @@ void KIMProxy::messageContact( const TQString& uid, const TQString& message ) { if ( KIMIface_stub* s = stubForUid( uid ) ) { - kapp->updateRemoteUserTimestamp( s->app() ); + tdeApp->updateRemoteUserTimestamp( s->app() ); s->messageContact( uid, message ); } } @@ -521,7 +521,7 @@ void KIMProxy::sendFile(const TQString &uid, const KURL &sourceURL, const TQStri { if ( it.current()->canReceiveFiles( uid ) ) { - kapp->updateRemoteUserTimestamp( it.current()->app() ); + tdeApp->updateRemoteUserTimestamp( it.current()->app() ); it.current()->sendFile( uid, sourceURL, altFileName, fileSize ); break; } @@ -643,7 +643,7 @@ KIMIface_stub * KIMProxy::stubForProtocol( const TQString &protocol) TQString KIMProxy::preferredApp() { - TDEConfig *store = new KSimpleConfig( IM_CLIENT_PREFERENCES_FILE ); + TDEConfig *store = new TDESimpleConfig( IM_CLIENT_PREFERENCES_FILE ); store->setGroup( IM_CLIENT_PREFERENCES_SECTION ); TQString preferredApp = store->readEntry( IM_CLIENT_PREFERENCES_ENTRY ); //kdDebug( 790 ) << k_funcinfo << "found preferred app: " << preferredApp << endl; diff --git a/interfaces/tdeimproxy/library/tdeimproxy.h b/interfaces/tdeimproxy/library/tdeimproxy.h index 293d1f723..5a7ff87e9 100644 --- a/interfaces/tdeimproxy/library/tdeimproxy.h +++ b/interfaces/tdeimproxy/library/tdeimproxy.h @@ -106,7 +106,7 @@ typedef TQMap<TQString, ContactPresenceListCurrent> PresenceStringMap; */ class TDEIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface { - Q_OBJECT + TQ_OBJECT struct Private; template<class> friend class KStaticDeleter; diff --git a/interfaces/tdemediaplayer/player.h b/interfaces/tdemediaplayer/player.h index 05582ca07..927144e5c 100644 --- a/interfaces/tdemediaplayer/player.h +++ b/interfaces/tdemediaplayer/player.h @@ -43,9 +43,9 @@ namespace KMediaPlayer * the user interface facets, for those who wish to provide their own * interface. */ -class KDE_EXPORT Player : public KParts::ReadOnlyPart, public PlayerDCOPObject +class TDE_EXPORT Player : public KParts::ReadOnlyPart, public PlayerDCOPObject { -Q_OBJECT +TQ_OBJECT public: /** This constructor is what to use when no GUI is required, as in the diff --git a/interfaces/tdemediaplayer/playerdcopobject.h b/interfaces/tdemediaplayer/playerdcopobject.h index 73a1cfa1d..4c2511e4a 100644 --- a/interfaces/tdemediaplayer/playerdcopobject.h +++ b/interfaces/tdemediaplayer/playerdcopobject.h @@ -30,7 +30,7 @@ namespace KMediaPlayer { -class KDE_EXPORT PlayerDCOPObject : public DCOPObject +class TDE_EXPORT PlayerDCOPObject : public DCOPObject { K_DCOP diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp index 370805a74..be0f92111 100644 --- a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp +++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp @@ -25,7 +25,7 @@ protected: { Q_UNUSED(className); Q_UNUSED(args); - return TQT_TQOBJECT(new KFileAudioPreview( dynamic_cast<TQWidget*>( parent ), name )); + return new KFileAudioPreview( dynamic_cast<TQWidget*>( parent ), name ); } }; @@ -41,7 +41,7 @@ class KFileAudioPreview::KFileAudioPreviewPrivate public: KFileAudioPreviewPrivate( TQWidget *parent ) { - player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", TQString(), TQT_TQOBJECT(parent) ); + player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", TQString(), parent ); } ~KFileAudioPreviewPrivate() @@ -93,7 +93,7 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name ) m_autoPlay = new TQCheckBox( i18n("Play &automatically"), box ); TDEConfigGroup config( TDEGlobal::config(), ConfigGroup ); m_autoPlay->setChecked( config.readBoolEntry( "Autoplay sounds", true ) ); - connect( m_autoPlay, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleAuto(bool)) ); + connect( m_autoPlay, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleAuto(bool)) ); } KFileAudioPreview::~KFileAudioPreview() diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h index 6eae52cf7..f67533df2 100644 --- a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h +++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h @@ -36,7 +36,7 @@ class KFileItem; */ class KFileAudioPreview : public KPreviewWidgetBase { - Q_OBJECT + TQ_OBJECT public: KFileAudioPreview(TQWidget *parent = 0, const char *name = 0 ); diff --git a/interfaces/tdemediaplayer/view.h b/interfaces/tdemediaplayer/view.h index c1d9dbe41..fce17f819 100644 --- a/interfaces/tdemediaplayer/view.h +++ b/interfaces/tdemediaplayer/view.h @@ -31,9 +31,9 @@ namespace KMediaPlayer { /** View is part of the user interface of a Player. */ -class KDE_EXPORT View : public TQWidget +class TDE_EXPORT View : public TQWidget { -Q_OBJECT +TQ_OBJECT public: /** Your typical TQWidget constructor. */ diff --git a/interfaces/tdescript/sample/shellscript.cpp b/interfaces/tdescript/sample/shellscript.cpp index 766613551..13b634cc6 100644 --- a/interfaces/tdescript/sample/shellscript.cpp +++ b/interfaces/tdescript/sample/shellscript.cpp @@ -31,9 +31,9 @@ K_EXPORT_COMPONENT_FACTORY( libshellscript, ShellScriptFactory( "ShellScript" ) ShellScript::ShellScript(KScriptClientInterface *parent, const char *, const TQStringList & ) : ScriptClientInterface(parent) { m_script = new TDEProcess(); - connect ( m_script, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(Exit(TDEProcess *))); - connect ( m_script, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(stdOut(TDEProcess *, char *, int ))); - connect ( m_script, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(stdErr(TDEProcess *, char *, int ))); + connect ( m_script, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(Exit(TDEProcess *))); + connect ( m_script, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQ_SLOT(stdOut(TDEProcess *, char *, int ))); + connect ( m_script, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQ_SLOT(stdErr(TDEProcess *, char *, int ))); // Connect feedback signals and slots //kdDebug() << "Building new script engine" << endl; } @@ -50,7 +50,7 @@ TQString ShellScript::script() const void ShellScript::setScript( const TQString &scriptFile ) { m_scriptName = scriptFile; - *m_script << "sh" << m_scriptName << kapp->dcopClient()->appId(); + *m_script << "sh" << m_scriptName << tdeApp->dcopClient()->appId(); } void ShellScript::setScript( const TQString &, const TQString & ) diff --git a/interfaces/tdescript/sample/shellscript.h b/interfaces/tdescript/sample/shellscript.h index 2cdaf7e5a..dc62dde33 100644 --- a/interfaces/tdescript/sample/shellscript.h +++ b/interfaces/tdescript/sample/shellscript.h @@ -22,11 +22,11 @@ #include <scriptinterface.h> #include <tqvariant.h> #include <tqobject.h> -#include <kprocess.h> +#include <tdeprocess.h> //using namespace KScriptInterface; class ShellScript : public KScriptInterface { - Q_OBJECT + TQ_OBJECT public: ShellScript(KScriptClientInterface *parent, const char *name, const TQStringList &args); virtual ~ShellScript(); diff --git a/interfaces/tdescript/scriptclientinterface.h b/interfaces/tdescript/scriptclientinterface.h index 0f07d34b2..e1c345e10 100644 --- a/interfaces/tdescript/scriptclientinterface.h +++ b/interfaces/tdescript/scriptclientinterface.h @@ -33,7 +33,7 @@ class TQString; * interfaces with this class. * @code * class MyScript : public TQObject, public KScriptClientInterface { - * Q_OBJECT + * TQ_OBJECT * public: * * MyScript(TQObject *parent) diff --git a/interfaces/tdescript/scriptinterface.h b/interfaces/tdescript/scriptinterface.h index 1c37b7f71..d52c0f85a 100644 --- a/interfaces/tdescript/scriptinterface.h +++ b/interfaces/tdescript/scriptinterface.h @@ -29,7 +29,7 @@ #define __scriptinterface_h__ #include <tqvariant.h> #include <tqobject.h> -#include <kdemacros.h> +#include <tdemacros.h> //#include <scripclientinterface.h> class TQString; @@ -44,9 +44,9 @@ class KScriptClientInterface; * @author Ian Reinhart Geiser <geiseri@kde.org> * **/ - class KDE_EXPORT KScriptInterface : public TQObject + class TDE_EXPORT KScriptInterface : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Return the current script code data diff --git a/interfaces/tdescript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp index c21f1f794..916ad2c74 100644 --- a/interfaces/tdescript/scriptloader.cpp +++ b/interfaces/tdescript/scriptloader.cpp @@ -24,7 +24,7 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <tdeconfig.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kstandarsdirs.h> #include <tdestdaccel.h> #include <kdebug.h> @@ -40,7 +40,7 @@ ScriptLoader::ScriptLoader(TDEMainWindow *parent) : TQObject (parent) m_theAction = new TDESelectAction ( i18n("TDE Scripts"), 0, this, - TQT_SLOT(runAction()), + TQ_SLOT(runAction()), m_parent->actionCollection(), "scripts"); } @@ -56,7 +56,7 @@ TDESelectAction * ScriptLoader::getScripts() // Get the available scripts for this application. TQStringList pluginList = ""; // Find plugins - TQString searchPath = kapp->name(); + TQString searchPath = tdeApp->name(); searchPath += "/scripts/"; TQDir d(locate( "data", searchPath)); kdDebug() << "loading plugin from " << locate( "data", searchPath) << endl; @@ -67,9 +67,9 @@ TDESelectAction * ScriptLoader::getScripts() while( (fi=it.current())) { // Query each desktop file - if(KDesktopFile::isDesktopFile(fi->absFilePath())) + if(TDEDesktopFile::isDesktopFile(fi->absFilePath())) { - KDesktopFile desktop((fi->absFilePath()), true); + TDEDesktopFile desktop((fi->absFilePath()), true); kdDebug () << "Trying to load script type: " << desktop.readType() << endl; KScriptInterface *tmpIface = KParts::ComponentFactory::createInstanceFromQuery<KScriptInterface>(desktop.readType() ); if( tmpIface != 0 ) diff --git a/interfaces/tdescript/scriptloader.h b/interfaces/tdescript/scriptloader.h index 7fa4fa93f..ece776c6d 100644 --- a/interfaces/tdescript/scriptloader.h +++ b/interfaces/tdescript/scriptloader.h @@ -26,9 +26,9 @@ /** * Script loader */ -class ScriptLoader : virtual public QObject +class ScriptLoader : virtual public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/interfaces/tdescript/scriptmanager.cpp b/interfaces/tdescript/scriptmanager.cpp index a0dfbe921..1f546485a 100644 --- a/interfaces/tdescript/scriptmanager.cpp +++ b/interfaces/tdescript/scriptmanager.cpp @@ -2,8 +2,8 @@ #include <tdeparts/part.h> #include <tdeparts/componentfactory.h> #include <tdeapplication.h> -#include <kdesktopfile.h> -#include <kstandarddirs.h> +#include <tdedesktopfile.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <tdemessagebox.h> @@ -46,12 +46,12 @@ bool KScriptManager::addScript( const TQString &scriptDesktopFile) TQString tmpScriptMethod = ""; // Read the desktop file - if(KDesktopFile::isDesktopFile(scriptDesktopFile)) + if(TDEDesktopFile::isDesktopFile(scriptDesktopFile)) { - KDesktopFile desktop(scriptDesktopFile, true); + TDEDesktopFile desktop(scriptDesktopFile, true); m_scripts.insert(desktop.readName(), new ScriptInfo()); m_scripts[desktop.readName()]->scriptType = desktop.readType(); - TQString localpath = TQString(kapp->name()) + "/scripts/" + desktop.readEntry("X-TDE-ScriptName", ""); + TQString localpath = TQString(tdeApp->name()) + "/scripts/" + desktop.readEntry("X-TDE-ScriptName", ""); m_scripts[desktop.readName()]->scriptFile = locate("data", localpath); // m_scripts[desktop.readName()]->scriptMethod = tmpScriptMethod; success = true; diff --git a/interfaces/tdescript/scriptmanager.h b/interfaces/tdescript/scriptmanager.h index d21219901..82ca96dc7 100644 --- a/interfaces/tdescript/scriptmanager.h +++ b/interfaces/tdescript/scriptmanager.h @@ -36,9 +36,9 @@ class ScriptInfo; * @author Ian Reinhart Geiser <geiseri@kde.org> * **/ - class KDE_EXPORT KScriptManager : public TQObject, public KScriptClientInterface + class TDE_EXPORT KScriptManager : public TQObject, public KScriptClientInterface { - Q_OBJECT + TQ_OBJECT friend class KScriptInterface; public: /** diff --git a/interfaces/tdetexteditor/blockselectiondcopinterface.h b/interfaces/tdetexteditor/blockselectiondcopinterface.h index 4b74fd2a0..66045239b 100644 --- a/interfaces/tdetexteditor/blockselectiondcopinterface.h +++ b/interfaces/tdetexteditor/blockselectiondcopinterface.h @@ -24,7 +24,7 @@ namespace KTextEditor Construct a new interface object for the text editor. @param Parent the parent BlockSelectionInterface object that will provide us with the functions for the interface. - @param name the QObject's name + @param name the TQObject's name */ BlockSelectionDCOPInterface( BlockSelectionInterface *Parent, const char *name ); /** diff --git a/interfaces/tdetexteditor/clipboarddcopinterface.h b/interfaces/tdetexteditor/clipboarddcopinterface.h index 8104e9d4d..9a75f9b97 100644 --- a/interfaces/tdetexteditor/clipboarddcopinterface.h +++ b/interfaces/tdetexteditor/clipboarddcopinterface.h @@ -24,7 +24,7 @@ namespace KTextEditor Construct a new interface object for the text editor. @param Parent the parent ClipboardInterface object that will provide us with the functions for the interface. - @param name the QObject's name + @param name the TQObject's name */ ClipboardDCOPInterface( ClipboardInterface *Parent, const char *name ); /** diff --git a/interfaces/tdetexteditor/configinterfaceextension.h b/interfaces/tdetexteditor/configinterfaceextension.h index 23fa5bb38..f640ab0c5 100644 --- a/interfaces/tdetexteditor/configinterfaceextension.h +++ b/interfaces/tdetexteditor/configinterfaceextension.h @@ -28,7 +28,7 @@ namespace KTextEditor class KTEXTEDITOR_EXPORT ConfigPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ConfigPage ( TQWidget *parent=0, const char *name=0 ); diff --git a/interfaces/tdetexteditor/document.h b/interfaces/tdetexteditor/document.h index 83d8b7cf6..817389ba3 100644 --- a/interfaces/tdetexteditor/document.h +++ b/interfaces/tdetexteditor/document.h @@ -32,7 +32,7 @@ class KTEXTEDITOR_EXPORT Document : public KTextEditor::Editor { friend class PrivateDocument; - Q_OBJECT + TQ_OBJECT public: diff --git a/interfaces/tdetexteditor/documentdcopinfo.h b/interfaces/tdetexteditor/documentdcopinfo.h index ea25284fe..aedaee6a5 100644 --- a/interfaces/tdetexteditor/documentdcopinfo.h +++ b/interfaces/tdetexteditor/documentdcopinfo.h @@ -25,7 +25,7 @@ namespace KTextEditor Construct a new interface object for the text editor. @param Parent the parent DocumentInfoInterface object that will provide us with the functions for the interface. - @param name the QObject's name + @param name the TQObject's name */ DocumentInfoDCOPInterface( DocumentInfoInterface *Parent, const char *name ); /** diff --git a/interfaces/tdetexteditor/editdcopinterface.h b/interfaces/tdetexteditor/editdcopinterface.h index f169fb15b..c0a0f6cdf 100644 --- a/interfaces/tdetexteditor/editdcopinterface.h +++ b/interfaces/tdetexteditor/editdcopinterface.h @@ -24,7 +24,7 @@ namespace KTextEditor Construct a new interface object for the text editor. @param Parent the parent EditInterface object that will provide us with the functions for the interface. - @param name the QObject's name + @param name the TQObject's name */ EditDCOPInterface( EditInterface *Parent, const char *name ); /** @@ -34,7 +34,7 @@ namespace KTextEditor virtual ~EditDCOPInterface(); k_dcop: /** - * @return the complete document as a single QString + * @return the complete document as a single TQString */ virtual TQString text (); diff --git a/interfaces/tdetexteditor/editinterface.h b/interfaces/tdetexteditor/editinterface.h index 05e4941f2..9da6a275d 100644 --- a/interfaces/tdetexteditor/editinterface.h +++ b/interfaces/tdetexteditor/editinterface.h @@ -48,12 +48,12 @@ class KTEXTEDITOR_EXPORT EditInterface * slots !!! */ /** - * @return the complete document as a single QString + * @return the complete document as a single TQString */ virtual TQString text () const = 0; /** - * @return a QString + * @return a TQString */ virtual TQString text ( uint startLine, uint startCol, uint endLine, uint endCol ) const = 0; diff --git a/interfaces/tdetexteditor/editor.h b/interfaces/tdetexteditor/editor.h index 8b6699f9f..475711a9d 100644 --- a/interfaces/tdetexteditor/editor.h +++ b/interfaces/tdetexteditor/editor.h @@ -40,7 +40,7 @@ class KTEXTEDITOR_EXPORT Editor : public KParts::ReadWritePart { friend class PrivateEditor; - Q_OBJECT + TQ_OBJECT public: diff --git a/interfaces/tdetexteditor/editorchooser.cpp b/interfaces/tdetexteditor/editorchooser.cpp index 1eddfb8d6..0fc06bd9e 100644 --- a/interfaces/tdetexteditor/editorchooser.cpp +++ b/interfaces/tdetexteditor/editorchooser.cpp @@ -75,7 +75,7 @@ EditorChooser:: ~EditorChooser(){ } void EditorChooser::readAppSetting(const TQString& postfix){ - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); TQString previousGroup=cfg->group(); cfg->setGroup("KTEXTEDITOR:"+postfix); TQString editor=cfg->readPathEntry("editor"); @@ -90,7 +90,7 @@ void EditorChooser::readAppSetting(const TQString& postfix){ } void EditorChooser::writeAppSetting(const TQString& postfix){ - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); 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"); @@ -105,7 +105,7 @@ KTextEditor::Document *EditorChooser::createDocument(TQObject *parent,const char KTextEditor::Document *tmpDoc=0; - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); TQString previousGroup=cfg->group(); cfg->setGroup("KTEXTEDITOR:"+postfix); TQString editor=cfg->readPathEntry("editor"); @@ -135,7 +135,7 @@ KTextEditor::Editor *EditorChooser::createEditor(TQWidget *parentWidget,TQObject KTextEditor::Editor *tmpEd=0; - TDEConfig *cfg=kapp->config(); + TDEConfig *cfg=tdeApp->config(); TQString previousGroup=cfg->group(); cfg->setGroup("KTEXTEDITOR:"+postfix); TQString editor=cfg->readPathEntry("editor"); diff --git a/interfaces/tdetexteditor/editorchooser.h b/interfaces/tdetexteditor/editorchooser.h index 251776c10..62feda5c6 100644 --- a/interfaces/tdetexteditor/editorchooser.h +++ b/interfaces/tdetexteditor/editorchooser.h @@ -16,7 +16,7 @@ class KTEXTEDITOR_EXPORT EditorChooser: public TQWidget { friend class PrivateEditorChooser; - Q_OBJECT + TQ_OBJECT public: EditorChooser(TQWidget *parent=0,const char *name=0); @@ -36,7 +36,7 @@ class KTEXTEDITOR_EXPORT EditorChooser: public TQWidget /* class EditorChooserBackEnd: public ComponentChooserPlugin { -Q_OBJECT +TQ_OBJECT public: EditorChooserBackEnd(TQObject *parent=0, const char *name=0); virtual ~EditorChooserBackEnd(); diff --git a/interfaces/tdetexteditor/encodingdcopinterface.h b/interfaces/tdetexteditor/encodingdcopinterface.h index 38de4e0aa..e13a6dff4 100644 --- a/interfaces/tdetexteditor/encodingdcopinterface.h +++ b/interfaces/tdetexteditor/encodingdcopinterface.h @@ -24,7 +24,7 @@ namespace KTextEditor Construct a new interface object for the text editor. @param Parent the parent EncodingInterface object that will provide us with the functions for the interface. - @param name the QObject's name + @param name the TQObject's name */ EncodingDCOPInterface( EncodingInterface *Parent, const char *name ); /** diff --git a/interfaces/tdetexteditor/plugin.h b/interfaces/tdetexteditor/plugin.h index 68416bf78..b13dc37e9 100644 --- a/interfaces/tdetexteditor/plugin.h +++ b/interfaces/tdetexteditor/plugin.h @@ -37,7 +37,7 @@ class KTEXTEDITOR_EXPORT Plugin : public TQObject { friend class PrivatePlugin; - Q_OBJECT + TQ_OBJECT public: Plugin ( Document *document = 0, const char *name = 0 ); diff --git a/interfaces/tdetexteditor/printdcopinterface.h b/interfaces/tdetexteditor/printdcopinterface.h index e41e6da5d..f3d176fbd 100644 --- a/interfaces/tdetexteditor/printdcopinterface.h +++ b/interfaces/tdetexteditor/printdcopinterface.h @@ -24,7 +24,7 @@ namespace KTextEditor Construct a new interface object for the text editor. @param Parent the parent PrintInterface object that will provide us with the functions for the interface. - @param name the QObject's name + @param name the TQObject's name */ PrintDCOPInterface( PrintInterface *Parent, const char *name ); /** diff --git a/interfaces/tdetexteditor/searchdcopinterface.h b/interfaces/tdetexteditor/searchdcopinterface.h index d4f558a26..e8a82a35b 100644 --- a/interfaces/tdetexteditor/searchdcopinterface.h +++ b/interfaces/tdetexteditor/searchdcopinterface.h @@ -24,7 +24,7 @@ namespace KTextEditor Construct a new interface object for the text editor. @param Parent the parent SearchInterface object that will provide us with the functions for the interface. - @param name the QObject's name + @param name the TQObject's name */ SearchDCOPInterface( SearchInterface *Parent, const char *name ); /** diff --git a/interfaces/tdetexteditor/selectiondcopinterface.h b/interfaces/tdetexteditor/selectiondcopinterface.h index aa2973540..70e6e2f0b 100644 --- a/interfaces/tdetexteditor/selectiondcopinterface.h +++ b/interfaces/tdetexteditor/selectiondcopinterface.h @@ -24,7 +24,7 @@ namespace KTextEditor Construct a new interface object for the text editor. @param Parent the parent SelectionInterface object that will provide us with the functions for the interface. - @param name the QObject's name + @param name the TQObject's name */ SelectionDCOPInterface( SelectionInterface *Parent, const char *name ); /** diff --git a/interfaces/tdetexteditor/templateinterface.cpp b/interfaces/tdetexteditor/templateinterface.cpp index 25c103196..f3de57447 100644 --- a/interfaces/tdetexteditor/templateinterface.cpp +++ b/interfaces/tdetexteditor/templateinterface.cpp @@ -75,8 +75,8 @@ bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget * TDEABC::StdAddressBook *addrBook = 0; TDEABC::Addressee userAddress; TQDateTime datetime = TQDateTime::currentDateTime(); - TQDate date = TQT_TQDATE_OBJECT(datetime.date()); - TQTime time = TQT_TQTIME_OBJECT(datetime.time()); + TQDate date = datetime.date(); + TQTime time = datetime.time(); TQMap<TQString,TQString>::Iterator it; for ( it = map.begin(); it != map.end(); ++it ) diff --git a/interfaces/tdetexteditor/undodcopinterface.h b/interfaces/tdetexteditor/undodcopinterface.h index b1a217036..5e324da03 100644 --- a/interfaces/tdetexteditor/undodcopinterface.h +++ b/interfaces/tdetexteditor/undodcopinterface.h @@ -24,7 +24,7 @@ namespace KTextEditor Construct a new interface object for the text editor. @param Parent the parent UndoInterface object that will provide us with the functions for the interface. - @param name the QObject's name + @param name the TQObject's name */ UndoDCOPInterface( UndoInterface *Parent, const char *name ); /** diff --git a/interfaces/tdetexteditor/view.h b/interfaces/tdetexteditor/view.h index 0a807d6b3..c8cf586b8 100644 --- a/interfaces/tdetexteditor/view.h +++ b/interfaces/tdetexteditor/view.h @@ -33,7 +33,7 @@ class KTEXTEDITOR_EXPORT View : public TQWidget, public KXMLGUIClient { friend class PrivateView; - Q_OBJECT + TQ_OBJECT public: /** diff --git a/interfaces/tdetexteditor/viewcursordcopinterface.h b/interfaces/tdetexteditor/viewcursordcopinterface.h index 4bae0b520..e0c956da0 100644 --- a/interfaces/tdetexteditor/viewcursordcopinterface.h +++ b/interfaces/tdetexteditor/viewcursordcopinterface.h @@ -24,7 +24,7 @@ namespace KTextEditor Construct a new interface object for the text editor. @param Parent the parent ViewCursorInterface object that will provide us with the functions for the interface. - @param name the QObject's name + @param name the TQObject's name */ ViewCursorDCOPInterface( ViewCursorInterface *Parent, const char *name ); /** diff --git a/interfaces/tdetexteditor/viewstatusmsgdcopinterface.h b/interfaces/tdetexteditor/viewstatusmsgdcopinterface.h index b4c5cf72e..aba5b60b5 100644 --- a/interfaces/tdetexteditor/viewstatusmsgdcopinterface.h +++ b/interfaces/tdetexteditor/viewstatusmsgdcopinterface.h @@ -24,7 +24,7 @@ namespace KTextEditor Construct a new interface object for the text editor. @param Parent the parent ViewStatusMsgInterface object that will provide us with the functions for the interface. - @param name the QObject's name + @param name the TQObject's name */ ViewStatusMsgDCOPInterface( ViewStatusMsgInterface *Parent, const char *name ); /** diff --git a/interfaces/terminal/kde_terminal_interface.h b/interfaces/terminal/kde_terminal_interface.h index 83e82e5e2..ff0dcb80c 100644 --- a/interfaces/terminal/kde_terminal_interface.h +++ b/interfaces/terminal/kde_terminal_interface.h @@ -22,7 +22,7 @@ class TQString; class TQStrList; -#include <kdemacros.h> +#include <tdemacros.h> /** * TerminalInterface is an interface implemented by KonsolePart to @@ -53,13 +53,13 @@ class TQStrList; * }; * // fetch the part.. * KParts::Part* p = static_cast<KParts::Part*>( - * factory->create( this, "tralala", TQOBJECT_OBJECT_NAME_STRING, + * factory->create( this, "tralala", "TQObject", * "KParts::ReadOnlyPart" ) ); * assert( p ); * setCentralWidget( p->widget() ); * * // cast the part to the TerminalInterface.. - * TerminalInterface* t = ::tqqt_cast<TerminalInterface*>( p ); + * TerminalInterface* t = ::tqt_cast<TerminalInterface*>( p ); * if( ! t ) * { * // This probably happens because the konsole that is installed @@ -78,8 +78,8 @@ class TQStrList; * // or connect to one of the signals. Connect to the Part object, * // not to the TerminalInterface, since the latter is no TQObject, * // and as such cannot have signals..: - * // connect( p, TQT_SIGNAL( processExited( int ) ), - * // this, TQT_SLOT( shellExited( int ) ) ); + * // connect( p, TQ_SIGNAL( processExited( int ) ), + * // this, TQ_SLOT( shellExited( int ) ) ); * // etc. * * \endcode @@ -88,7 +88,7 @@ class TQStrList; * * @author Dominique Devriese <devriese@kde.org> */ -class KDE_EXPORT TerminalInterface +class TDE_EXPORT TerminalInterface { public: /** @@ -125,7 +125,7 @@ public: @since 3.5 */ -class KDE_EXPORT ExtTerminalInterface +class TDE_EXPORT ExtTerminalInterface { public: /** diff --git a/interfaces/terminal/test/main.cpp b/interfaces/terminal/test/main.cpp index 8130f85d6..f0d51b259 100644 --- a/interfaces/terminal/test/main.cpp +++ b/interfaces/terminal/test/main.cpp @@ -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", TQOBJECT_OBJECT_NAME_STRING, "KParts::ReadOnlyPart" ) ); + KParts::Part* p = factory->create( this, "tralala", "TQObject", "KParts::ReadOnlyPart" ) ; setCentralWidget( p->widget() ); - TerminalInterface* t = ::tqqt_cast<TerminalInterface*>( p ); + TerminalInterface* t = ::tqt_cast<TerminalInterface*>( p ); t->showShellInDir( TQDir::home().path() ); // TQStrList l; // l.append( "python" ); // t->startProgram( TQString::fromUtf8( "/usr/bin/python" ), l ); - connect( p, TQT_SIGNAL( processExited( int ) ), - this, TQT_SLOT( pythonExited( int ) ) ); + connect( p, TQ_SIGNAL( processExited( int ) ), + this, TQ_SLOT( pythonExited( int ) ) ); } @@ -46,11 +46,11 @@ int main( int argc, char** argv ) void Win::pythonExited() { std::cerr << "hee, " << p << std::endl; - std::cerr << ( ::tqqt_cast<TerminalInterface>(p) ) << std::endl; + std::cerr << ( ::tqt_cast<TerminalInterface>(p) ) << std::endl; // KMessageBox::sorry( this, TQString::fromUtf8( "Exited, status was %1" ).arg( status ) ); - disconnect(p, TQT_SIGNAL( processExited() ), - this, TQT_SLOT( pythonExited() )); - TerminalInterface* t = ::tqqt_cast<TerminalInterface*>( p ); + disconnect(p, TQ_SIGNAL( processExited() ), + this, TQ_SLOT( pythonExited() )); + TerminalInterface* t = ::tqt_cast<TerminalInterface*>( p ); TQStrList l; l.append( "echo" ); l.append( "hello world" ); diff --git a/interfaces/terminal/test/main.h b/interfaces/terminal/test/main.h index 256b0840a..bf87cb041 100644 --- a/interfaces/terminal/test/main.h +++ b/interfaces/terminal/test/main.h @@ -5,7 +5,7 @@ class Win : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT KParts::Part* p; public: Win(); |