diff options
Diffstat (limited to 'kicker/proxy')
-rw-r--r-- | kicker/proxy/appletproxy.cpp | 100 | ||||
-rw-r--r-- | kicker/proxy/appletproxy.h | 24 | ||||
-rw-r--r-- | kicker/proxy/extensiondebugger.cpp | 42 | ||||
-rw-r--r-- | kicker/proxy/extensiondebugger.h | 4 | ||||
-rw-r--r-- | kicker/proxy/extensionproxy.cpp | 80 | ||||
-rw-r--r-- | kicker/proxy/extensionproxy.h | 20 |
6 files changed, 135 insertions, 135 deletions
diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp index d9ac588d5..0501fcd9a 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -23,9 +23,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <stdlib.h> -#include <qstring.h> -#include <qfile.h> -#include <qobjectlist.h> +#include <tqstring.h> +#include <tqfile.h> +#include <tqobjectlist.h> #include <qxembed.h> #include <kapplication.h> @@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kmessagebox.h> #include <kpanelapplet.h> #include <kaboutdata.h> -#include <qfileinfo.h> +#include <tqfileinfo.h> #include <dcopclient.h> #include <kwin.h> @@ -97,20 +97,20 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) KCmdLineArgs::usage(i18n("No desktop file specified") ); // Perhaps we should use a konsole-like solution here (shell, list of args...) - QString desktopfile( args->arg(0) ); + TQString desktopfile( args->arg(0) ); // load applet DSO - if ( !QFile::exists( desktopfile ) && + if ( !TQFile::exists( desktopfile ) && !desktopfile.endsWith( ".desktop" ) ) desktopfile.append( ".desktop" ); - if ( !QFile::exists( desktopfile ) ) + if ( !TQFile::exists( desktopfile ) ) desktopfile = locate( "applets", desktopfile ).latin1(); proxy.loadApplet( desktopfile, args->getOption("configfile")); // dock into our applet container - QCString callbackid = args->getOption( "callbackid"); + TQCString callbackid = args->getOption( "callbackid"); if ( callbackid.isEmpty() ) proxy.showStandalone(); else @@ -119,8 +119,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) return a.exec(); } -AppletProxy::AppletProxy(QObject* parent, const char* name) - : QObject(parent, name) +AppletProxy::AppletProxy(TQObject* parent, const char* name) + : TQObject(parent, name) , DCOPObject("AppletProxy") , _info(0) , _applet(0) @@ -142,7 +142,7 @@ AppletProxy::AppletProxy(QObject* parent, const char* name) exit(0); } - _bg = QPixmap(); + _bg = TQPixmap(); } AppletProxy::~AppletProxy() @@ -152,12 +152,12 @@ AppletProxy::~AppletProxy() delete _applet; } -void AppletProxy::loadApplet(const QString& desktopFile, const QString& configFile) +void AppletProxy::loadApplet(const TQString& desktopFile, const TQString& configFile) { - QString df; + TQString df; // try simple path first - QFileInfo finfo( desktopFile ); + TQFileInfo finfo( desktopFile ); if ( finfo.exists() ) { df = finfo.absFilePath(); } else { @@ -165,7 +165,7 @@ void AppletProxy::loadApplet(const QString& desktopFile, const QString& configFi df = KGlobal::dirs()->findResource("applets", desktopFile); } - QFile file(df); + TQFile file(df); // does the config file exist? if (df.isNull() || !file.exists()) { kdError() << "Failed to locate applet desktop file: " << desktopFile << endl; @@ -197,15 +197,15 @@ void AppletProxy::loadApplet(const QString& desktopFile, const QString& configFi } // connect updateLayout signal - connect(_applet, SIGNAL(updateLayout()), SLOT(slotUpdateLayout())); + connect(_applet, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout())); // connect requestFocus signal - connect(_applet, SIGNAL(requestFocus()), SLOT(slotRequestFocus())); + connect(_applet, TQT_SIGNAL(requestFocus()), TQT_SLOT(slotRequestFocus())); } KPanelApplet* AppletProxy::loadApplet(const AppletInfo& info) { KLibLoader* loader = KLibLoader::self(); - KLibrary* lib = loader->library(QFile::encodeName(info.library())); + KLibrary* lib = loader->library(TQFile::encodeName(info.library())); if (!lib) { @@ -214,8 +214,8 @@ KPanelApplet* AppletProxy::loadApplet(const AppletInfo& info) return 0; } - KPanelApplet* (*init_ptr)(QWidget *, const QString&); - init_ptr = (KPanelApplet* (*)(QWidget *, const QString&))lib->symbol( "init" ); + KPanelApplet* (*init_ptr)(TQWidget *, const TQString&); + init_ptr = (KPanelApplet* (*)(TQWidget *, const TQString&))lib->symbol( "init" ); if (!init_ptr) { @@ -226,21 +226,21 @@ KPanelApplet* AppletProxy::loadApplet(const AppletInfo& info) return init_ptr(0, info.configFile()); } -void AppletProxy::repaintApplet(QWidget* widget) +void AppletProxy::repaintApplet(TQWidget* widget) { widget->repaint(); - const QObjectList* children = widget->children(); + const TQObjectList* children = widget->children(); if (!children) { return; } - QObjectList::iterator it = children->begin(); + TQObjectList::iterator it = children->begin(); for (; it != children->end(); ++it) { - QWidget *w = dynamic_cast<QWidget*>(*it); + TQWidget *w = dynamic_cast<TQWidget*>(*it); if (w) { repaintApplet(w); @@ -248,7 +248,7 @@ void AppletProxy::repaintApplet(QWidget* widget) } } -void AppletProxy::dock(const QCString& callbackID) +void AppletProxy::dock(const TQCString& callbackID) { kdDebug(1210) << "Callback ID: " << callbackID << endl; @@ -258,16 +258,16 @@ void AppletProxy::dock(const QCString& callbackID) DCOPClient* dcop = kapp->dcopClient(); dcop->setNotifications(true); - connect(dcop, SIGNAL(applicationRemoved(const QCString&)), - SLOT(slotApplicationRemoved(const QCString&))); + connect(dcop, TQT_SIGNAL(applicationRemoved(const TQCString&)), + TQT_SLOT(slotApplicationRemoved(const TQCString&))); WId win; // get docked { - QCString replyType; - QByteArray data, replyData; - QDataStream dataStream( data, IO_WriteOnly ); + TQCString replyType; + TQByteArray data, replyData; + TQDataStream dataStream( data, IO_WriteOnly ); int actions = 0; if (_applet) actions = _applet->actions(); @@ -282,7 +282,7 @@ void AppletProxy::dock(const QCString& callbackID) int screen_number = 0; if (qt_xdisplay()) screen_number = DefaultScreen(qt_xdisplay()); - QCString appname; + TQCString appname; if (screen_number == 0) appname = "kicker"; else @@ -298,7 +298,7 @@ void AppletProxy::dock(const QCString& callbackID) exit(0); } - QDataStream reply( replyData, IO_ReadOnly ); + TQDataStream reply( replyData, IO_ReadOnly ); reply >> win; // request background @@ -328,15 +328,15 @@ void AppletProxy::dock(const QCString& callbackID) } -bool AppletProxy::process(const QCString &fun, const QByteArray &data, - QCString& replyType, QByteArray &replyData) +bool AppletProxy::process(const TQCString &fun, const TQByteArray &data, + TQCString& replyType, TQByteArray &replyData) { if ( fun == "widthForHeight(int)" ) { - QDataStream dataStream( data, IO_ReadOnly ); + TQDataStream dataStream( data, IO_ReadOnly ); int height; dataStream >> height; - QDataStream reply( replyData, IO_WriteOnly ); + TQDataStream reply( replyData, IO_WriteOnly ); replyType = "int"; if (!_applet) @@ -348,10 +348,10 @@ bool AppletProxy::process(const QCString &fun, const QByteArray &data, } else if ( fun == "heightForWidth(int)" ) { - QDataStream dataStream( data, IO_ReadOnly ); + TQDataStream dataStream( data, IO_ReadOnly ); int width; dataStream >> width; - QDataStream reply( replyData, IO_WriteOnly ); + TQDataStream reply( replyData, IO_WriteOnly ); replyType = "int"; if(!_applet) @@ -363,7 +363,7 @@ bool AppletProxy::process(const QCString &fun, const QByteArray &data, } else if ( fun == "setDirection(int)" ) { - QDataStream dataStream( data, IO_ReadOnly ); + TQDataStream dataStream( data, IO_ReadOnly ); int dir; dataStream >> dir; @@ -374,7 +374,7 @@ bool AppletProxy::process(const QCString &fun, const QByteArray &data, } else if ( fun == "setAlignment(int)" ) { - QDataStream dataStream( data, IO_ReadOnly ); + TQDataStream dataStream( data, IO_ReadOnly ); int alignment; dataStream >> alignment; @@ -412,7 +412,7 @@ bool AppletProxy::process(const QCString &fun, const QByteArray &data, } else if ( fun == "actions()" ) { - QDataStream reply( replyData, IO_WriteOnly ); + TQDataStream reply( replyData, IO_WriteOnly ); int actions = 0; if(_applet) actions = _applet->actions(); reply << actions; @@ -421,16 +421,16 @@ bool AppletProxy::process(const QCString &fun, const QByteArray &data, } else if ( fun == "type()" ) { - QDataStream reply( replyData, IO_WriteOnly ); + TQDataStream reply( replyData, IO_WriteOnly ); int type = 0; if (_applet) type = static_cast<int>(_applet->type()); reply << type; replyType = "int"; return true; } - else if ( fun == "setBackground(QPixmap)" ) + else if ( fun == "setBackground(TQPixmap)" ) { - QDataStream dataStream( data, IO_ReadOnly ); + TQDataStream dataStream( data, IO_ReadOnly ); dataStream >> _bg; if(_applet) if ( _bg.isNull() ) { // no transparency @@ -453,11 +453,11 @@ void AppletProxy::slotUpdateLayout() { if(_callbackID.isNull()) return; - QByteArray data; + TQByteArray data; int screen_number = 0; if (qt_xdisplay()) screen_number = DefaultScreen(qt_xdisplay()); - QCString appname; + TQCString appname; if (screen_number == 0) appname = "kicker"; else @@ -470,11 +470,11 @@ void AppletProxy::slotRequestFocus() { if(_callbackID.isNull()) return; - QByteArray data; + TQByteArray data; int screen_number = 0; if (qt_xdisplay()) screen_number = DefaultScreen(qt_xdisplay()); - QCString appname; + TQCString appname; if (screen_number == 0) appname = "kicker"; else @@ -483,12 +483,12 @@ void AppletProxy::slotRequestFocus() kapp->dcopClient()->send(appname, _callbackID, "requestFocus()", data); } -void AppletProxy::slotApplicationRemoved(const QCString& appId) +void AppletProxy::slotApplicationRemoved(const TQCString& appId) { int screen_number = 0; if (qt_xdisplay()) screen_number = DefaultScreen(qt_xdisplay()); - QCString appname; + TQCString appname; if (screen_number == 0) appname = "kicker"; else diff --git a/kicker/proxy/appletproxy.h b/kicker/proxy/appletproxy.h index 182280193..4c504022f 100644 --- a/kicker/proxy/appletproxy.h +++ b/kicker/proxy/appletproxy.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __appletproxy_h__ #define __appletproxy_h__ -#include <qcstring.h> -#include <qobject.h> +#include <tqcstring.h> +#include <tqobject.h> #include <dcopobject.h> @@ -34,34 +34,34 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class KPanelApplet; class KickerPluginManager; -class AppletProxy : public QObject, DCOPObject +class AppletProxy : public TQObject, DCOPObject { Q_OBJECT public: - AppletProxy(QObject* parent, const char* name = 0); + AppletProxy(TQObject* parent, const char* name = 0); ~AppletProxy(); - void loadApplet(const QString& desktopFile, const QString& configFile); + void loadApplet(const TQString& desktopFile, const TQString& configFile); KPanelApplet* loadApplet(const AppletInfo& info); - void dock(const QCString& callbackID); + void dock(const TQCString& callbackID); void showStandalone(); - bool process(const QCString &fun, const QByteArray &data, - QCString& replyType, QByteArray &replyData); + bool process(const TQCString &fun, const TQByteArray &data, + TQCString& replyType, TQByteArray &replyData); protected slots: void slotUpdateLayout(); void slotRequestFocus(); - void slotApplicationRemoved(const QCString&); + void slotApplicationRemoved(const TQCString&); private: - void repaintApplet(QWidget* widget); + void repaintApplet(TQWidget* widget); AppletInfo *_info; KPanelApplet *_applet; - QCString _callbackID; - QPixmap _bg; + TQCString _callbackID; + TQPixmap _bg; }; #endif diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp index f7c3309c4..796f10c93 100644 --- a/kicker/proxy/extensiondebugger.cpp +++ b/kicker/proxy/extensiondebugger.cpp @@ -21,9 +21,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#include <qfile.h> -#include <qlayout.h> -#include <qpushbutton.h> +#include <tqfile.h> +#include <tqlayout.h> +#include <tqpushbutton.h> #include <kapplication.h> #include <kglobal.h> @@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kdebug.h> #include <kpanelextension.h> #include <kaboutdata.h> -#include <qfileinfo.h> +#include <tqfileinfo.h> #include "appletinfo.h" #include "extensiondebugger.h" @@ -51,7 +51,7 @@ static KCmdLineOptions options[] = KPanelExtension* loadExtension(const AppletInfo& info) { KLibLoader* loader = KLibLoader::self(); - KLibrary* lib = loader->library(QFile::encodeName(info.library())); + KLibrary* lib = loader->library(TQFile::encodeName(info.library())); if (!lib) { @@ -60,8 +60,8 @@ KPanelExtension* loadExtension(const AppletInfo& info) return 0; } - KPanelExtension* (*init_ptr)(QWidget *, const QString&); - init_ptr = (KPanelExtension* (*)(QWidget *, const QString&))lib->symbol( "init" ); + KPanelExtension* (*init_ptr)(TQWidget *, const TQString&); + init_ptr = (KPanelExtension* (*)(TQWidget *, const TQString&))lib->symbol( "init" ); if (!init_ptr) { @@ -91,7 +91,7 @@ int main( int argc, char ** argv ) KGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") + "kicker/extensions"); - QString df; + TQString df; // parse cmdline args KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); @@ -101,19 +101,19 @@ int main( int argc, char ** argv ) KCmdLineArgs::usage(i18n("No desktop file specified") ); - QCString desktopFile = QCString( args->arg(0) ); + TQCString desktopFile = TQCString( args->arg(0) ); // try simple path first - QFileInfo finfo( desktopFile ); + TQFileInfo finfo( desktopFile ); if ( finfo.exists() ) { df = finfo.absFilePath(); } else { // locate desktop file - df = KGlobal::dirs()->findResource("extensions", QString(desktopFile)); + df = KGlobal::dirs()->findResource("extensions", TQString(desktopFile)); } // does the config file exist? - if (!QFile::exists(df)) { + if (!TQFile::exists(df)) { kdError() << "Failed to locate extension desktop file: " << desktopFile << endl; return 1; } @@ -129,7 +129,7 @@ int main( int argc, char ** argv ) ExtensionContainer *container = new ExtensionContainer( extension ); container->show(); - QObject::connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) ); + TQObject::connect( &a, TQT_SIGNAL( lastWindowClosed() ), &a, TQT_SLOT( quit() ) ); int result = a.exec(); @@ -137,19 +137,19 @@ int main( int argc, char ** argv ) return result; } -ExtensionContainer::ExtensionContainer( KPanelExtension *extension, QWidget *parent, const char *name ) - : QWidget( parent, name ), m_extension( extension ) +ExtensionContainer::ExtensionContainer( KPanelExtension *extension, TQWidget *parent, const char *name ) + : TQWidget( parent, name ), m_extension( extension ) { - ( new QVBoxLayout( this ) )->setAutoAdd( true ); + ( new TQVBoxLayout( this ) )->setAutoAdd( true ); - QPushButton *configButton = new QPushButton( i18n( "Configure..." ), this ); - connect( configButton, SIGNAL( clicked() ), - this, SLOT( showPreferences() ) ); + TQPushButton *configButton = new TQPushButton( i18n( "Configure..." ), this ); + connect( configButton, TQT_SIGNAL( clicked() ), + this, TQT_SLOT( showPreferences() ) ); - m_extension->reparent( this, QPoint( 0, 0 ) ); + m_extension->reparent( this, TQPoint( 0, 0 ) ); } -void ExtensionContainer::resizeEvent( QResizeEvent * ) +void ExtensionContainer::resizeEvent( TQResizeEvent * ) { m_extension->setGeometry( 0, 0, width(), height() ); } diff --git a/kicker/proxy/extensiondebugger.h b/kicker/proxy/extensiondebugger.h index 36745ae90..87ac76ecb 100644 --- a/kicker/proxy/extensiondebugger.h +++ b/kicker/proxy/extensiondebugger.h @@ -32,10 +32,10 @@ class ExtensionContainer : public QWidget Q_OBJECT public: - ExtensionContainer(KPanelExtension *extension, QWidget* parent = 0, const char* name = 0); + ExtensionContainer(KPanelExtension *extension, TQWidget* parent = 0, const char* name = 0); protected: - void resizeEvent( QResizeEvent *ev ); + void resizeEvent( TQResizeEvent *ev ); private slots: void showPreferences(); diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index 0fbb341e5..3d931c95b 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -23,8 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <stdlib.h> -#include <qstring.h> -#include <qfile.h> +#include <tqstring.h> +#include <tqfile.h> #include <qxembed.h> #include <kapplication.h> @@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kdebug.h> #include <kpanelextension.h> #include <kaboutdata.h> -#include <qfileinfo.h> +#include <tqfileinfo.h> #include <dcopclient.h> #include "appletinfo.h" @@ -90,7 +90,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) } // Perhaps we should use a konsole-like solution here (shell, list of args...) - QCString desktopfile = QCString( args->arg(0) ); + TQCString desktopfile = TQCString( args->arg(0) ); // load extension DSO proxy.loadExtension( desktopfile, args->getOption("configfile")); @@ -101,8 +101,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) return a.exec(); } -ExtensionProxy::ExtensionProxy(QObject* parent, const char* name) - : QObject(parent, name) +ExtensionProxy::ExtensionProxy(TQObject* parent, const char* name) + : TQObject(parent, name) , DCOPObject("ExtensionProxy") , _info(0) , _extension(0) @@ -124,20 +124,20 @@ ExtensionProxy::~ExtensionProxy() kapp->dcopClient()->detach(); } -void ExtensionProxy::loadExtension(const QCString& desktopFile, const QCString& configFile) +void ExtensionProxy::loadExtension(const TQCString& desktopFile, const TQCString& configFile) { - QString df; + TQString df; // try simple path first - QFileInfo finfo( desktopFile ); + TQFileInfo finfo( desktopFile ); if ( finfo.exists() ) { df = finfo.absFilePath(); } else { // locate desktop file - df = KGlobal::dirs()->findResource("extensions", QString(desktopFile)); + df = KGlobal::dirs()->findResource("extensions", TQString(desktopFile)); } - QFile file(df); + TQFile file(df); // does the config file exist? if (df.isNull() || !file.exists()) { kdError() << "Failed to locate extension desktop file: " << desktopFile << endl; @@ -161,13 +161,13 @@ void ExtensionProxy::loadExtension(const QCString& desktopFile, const QCString& } // connect updateLayout signal - connect(_extension, SIGNAL(updateLayout()), SLOT(slotUpdateLayout())); + connect(_extension, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout())); } KPanelExtension* ExtensionProxy::loadExtension(const AppletInfo& info) { KLibLoader* loader = KLibLoader::self(); - KLibrary* lib = loader->library(QFile::encodeName(info.library())); + KLibrary* lib = loader->library(TQFile::encodeName(info.library())); if (!lib) { @@ -176,8 +176,8 @@ KPanelExtension* ExtensionProxy::loadExtension(const AppletInfo& info) return 0; } - KPanelExtension* (*init_ptr)(QWidget *, const QString&); - init_ptr = (KPanelExtension* (*)(QWidget *, const QString&))lib->symbol( "init" ); + KPanelExtension* (*init_ptr)(TQWidget *, const TQString&); + init_ptr = (KPanelExtension* (*)(TQWidget *, const TQString&))lib->symbol( "init" ); if (!init_ptr) { @@ -188,7 +188,7 @@ KPanelExtension* ExtensionProxy::loadExtension(const AppletInfo& info) return init_ptr(0, info.configFile()); } -void ExtensionProxy::dock(const QCString& callbackID) +void ExtensionProxy::dock(const TQCString& callbackID) { kdDebug(1210) << "Callback ID: " << callbackID << endl; @@ -198,16 +198,16 @@ void ExtensionProxy::dock(const QCString& callbackID) DCOPClient* dcop = kapp->dcopClient(); dcop->setNotifications(true); - connect(dcop, SIGNAL(applicationRemoved(const QCString&)), - SLOT(slotApplicationRemoved(const QCString&))); + connect(dcop, TQT_SIGNAL(applicationRemoved(const TQCString&)), + TQT_SLOT(slotApplicationRemoved(const TQCString&))); WId win; // get docked { - QCString replyType; - QByteArray data, replyData; - QDataStream dataStream( data, IO_WriteOnly ); + TQCString replyType; + TQByteArray data, replyData; + TQDataStream dataStream( data, IO_WriteOnly ); int actions = 0; if(_extension) actions = _extension->actions(); @@ -222,7 +222,7 @@ void ExtensionProxy::dock(const QCString& callbackID) int screen_number = 0; if (qt_xdisplay()) screen_number = DefaultScreen(qt_xdisplay()); - QCString appname; + TQCString appname; if (screen_number == 0) appname = "kicker"; else @@ -235,7 +235,7 @@ void ExtensionProxy::dock(const QCString& callbackID) exit(0); } - QDataStream reply( replyData, IO_ReadOnly ); + TQDataStream reply( replyData, IO_ReadOnly ); reply >> win; } @@ -255,19 +255,19 @@ void ExtensionProxy::dock(const QCString& callbackID) } } -bool ExtensionProxy::process(const QCString &fun, const QByteArray &data, - QCString& replyType, QByteArray &replyData) +bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data, + TQCString& replyType, TQByteArray &replyData) { - if ( fun == "sizeHint(int,QSize)" ) + if ( fun == "sizeHint(int,TQSize)" ) { - QDataStream dataStream( data, IO_ReadOnly ); + TQDataStream dataStream( data, IO_ReadOnly ); int pos; - QSize maxSize; + TQSize maxSize; dataStream >> pos; dataStream >> maxSize; - QDataStream reply( replyData, IO_WriteOnly ); - replyType = "QSize"; + TQDataStream reply( replyData, IO_WriteOnly ); + replyType = "TQSize"; if(!_extension) reply << maxSize; @@ -278,7 +278,7 @@ bool ExtensionProxy::process(const QCString &fun, const QByteArray &data, } else if ( fun == "setPosition(int)" ) { - QDataStream dataStream( data, IO_ReadOnly ); + TQDataStream dataStream( data, IO_ReadOnly ); int pos; dataStream >> pos; @@ -289,7 +289,7 @@ bool ExtensionProxy::process(const QCString &fun, const QByteArray &data, } else if ( fun == "setAlignment(int)" ) { - QDataStream dataStream( data, IO_ReadOnly ); + TQDataStream dataStream( data, IO_ReadOnly ); int alignment; dataStream >> alignment; @@ -300,7 +300,7 @@ bool ExtensionProxy::process(const QCString &fun, const QByteArray &data, } else if ( fun == "setSize(int,int)" ) { - QDataStream dataStream( data, IO_ReadOnly ); + TQDataStream dataStream( data, IO_ReadOnly ); int serializedSize; int custom; dataStream >> serializedSize; @@ -338,7 +338,7 @@ bool ExtensionProxy::process(const QCString &fun, const QByteArray &data, } else if ( fun == "actions()" ) { - QDataStream reply( replyData, IO_WriteOnly ); + TQDataStream reply( replyData, IO_WriteOnly ); int actions = 0; if(_extension) actions = _extension->actions(); reply << actions; @@ -347,7 +347,7 @@ bool ExtensionProxy::process(const QCString &fun, const QByteArray &data, } else if ( fun == "preferedPosition()" ) { - QDataStream reply( replyData, IO_WriteOnly ); + TQDataStream reply( replyData, IO_WriteOnly ); int pos = static_cast<int>(KPanelExtension::Bottom); if(_extension) pos = static_cast<int>(_extension->preferedPosition()); reply << pos; @@ -356,7 +356,7 @@ bool ExtensionProxy::process(const QCString &fun, const QByteArray &data, } else if ( fun == "type()" ) { - QDataStream reply( replyData, IO_WriteOnly ); + TQDataStream reply( replyData, IO_WriteOnly ); int type = 0; if (_extension) type = static_cast<int>(_extension->type()); reply << type; @@ -370,11 +370,11 @@ void ExtensionProxy::slotUpdateLayout() { if(_callbackID.isNull()) return; - QByteArray data; + TQByteArray data; int screen_number = 0; if (qt_xdisplay()) screen_number = DefaultScreen(qt_xdisplay()); - QCString appname; + TQCString appname; if (screen_number == 0) appname = "kicker"; else @@ -383,12 +383,12 @@ void ExtensionProxy::slotUpdateLayout() kapp->dcopClient()->send(appname, _callbackID, "updateLayout()", data); } -void ExtensionProxy::slotApplicationRemoved(const QCString& appId) +void ExtensionProxy::slotApplicationRemoved(const TQCString& appId) { int screen_number = 0; if (qt_xdisplay()) screen_number = DefaultScreen(qt_xdisplay()); - QCString appname; + TQCString appname; if (screen_number == 0) appname = "kicker"; else diff --git a/kicker/proxy/extensionproxy.h b/kicker/proxy/extensionproxy.h index e5b8ca96d..88bc0a325 100644 --- a/kicker/proxy/extensionproxy.h +++ b/kicker/proxy/extensionproxy.h @@ -24,8 +24,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef __extensionproxy_h__ #define __extensionproxy_h__ -#include <qcstring.h> -#include <qobject.h> +#include <tqcstring.h> +#include <tqobject.h> #include <dcopobject.h> @@ -33,29 +33,29 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class KPanelExtension; -class ExtensionProxy : public QObject, DCOPObject +class ExtensionProxy : public TQObject, DCOPObject { Q_OBJECT public: - ExtensionProxy(QObject* parent, const char* name = 0); + ExtensionProxy(TQObject* parent, const char* name = 0); ~ExtensionProxy(); - void loadExtension(const QCString& desktopFile, const QCString& configFile); + void loadExtension(const TQCString& desktopFile, const TQCString& configFile); KPanelExtension* loadExtension(const AppletInfo& info); - void dock(const QCString& callbackID); + void dock(const TQCString& callbackID); - bool process(const QCString &fun, const QByteArray &data, - QCString& replyType, QByteArray &replyData); + bool process(const TQCString &fun, const TQByteArray &data, + TQCString& replyType, TQByteArray &replyData); protected slots: void slotUpdateLayout(); - void slotApplicationRemoved(const QCString&); + void slotApplicationRemoved(const TQCString&); private: AppletInfo *_info; KPanelExtension *_extension; - QCString _callbackID; + TQCString _callbackID; }; #endif |