summaryrefslogtreecommitdiffstats
path: root/khotkeys/app
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:33:34 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:33:34 +0000
commitc663b6440964f6ac48027143ac9e63298991f9d0 (patch)
tree6d8b0c5a5f9db1ee16acf98b1397cea9126b281d /khotkeys/app
parenta061f7191beebb0e4a3b0c0a7c534ec5f22f2dc7 (diff)
downloadtdebase-c663b6440964f6ac48027143ac9e63298991f9d0.tar.gz
tdebase-c663b6440964f6ac48027143ac9e63298991f9d0.zip
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khotkeys/app')
-rw-r--r--khotkeys/app/app.cpp14
-rw-r--r--khotkeys/app/app.h2
-rw-r--r--khotkeys/app/kded.cpp8
-rw-r--r--khotkeys/app/kded.h2
4 files changed, 13 insertions, 13 deletions
diff --git a/khotkeys/app/app.cpp b/khotkeys/app/app.cpp
index 612977aed..3391ca1aa 100644
--- a/khotkeys/app/app.cpp
+++ b/khotkeys/app/app.cpp
@@ -39,7 +39,7 @@ namespace KHotKeys
KHotKeysApp::KHotKeysApp()
: KUniqueApplication( false, true ), // no styles
- delete_helper( new QObject )
+ delete_helper( new TQObject )
{
init_global_data( true, delete_helper ); // grab keys
// CHECKME triggery a dalsi vytvaret az tady za inicializaci
@@ -51,9 +51,9 @@ KHotKeysApp::~KHotKeysApp()
{
// CHECKME triggery a dalsi rusit uz tady pred cleanupem
delete actions_root;
-// Many global data should be destroyed while the QApplication object still
+// Many global data should be destroyed while the TQApplication object still
// exists, and therefore 'this' cannot be the parent, as ~Object
-// for 'this' would be called after ~QApplication - use proxy object
+// for 'this' would be called after ~TQApplication - use proxy object
delete delete_helper;
}
@@ -96,7 +96,7 @@ int KDE_EXPORT kdemain( int argc, char** argv )
{
{
// multiheaded hotkeys
- QCString multiHead = getenv("KDE_MULTIHEAD");
+ TQCString multiHead = getenv("KDE_MULTIHEAD");
if (multiHead.lower() == "true") {
Display *dpy = XOpenDisplay(NULL);
if (! dpy) {
@@ -108,14 +108,14 @@ int KDE_EXPORT kdemain( int argc, char** argv )
int number_of_screens = ScreenCount(dpy);
khotkeys_screen_number = DefaultScreen(dpy);
int pos;
- QCString displayname = XDisplayString(dpy);
+ TQCString displayname = XDisplayString(dpy);
XCloseDisplay(dpy);
dpy = 0;
if ((pos = displayname.findRev('.')) != -1)
displayname.remove(pos, 10);
- QCString env;
+ TQCString env;
if (number_of_screens != 1) {
for (int i = 0; i < number_of_screens; i++) {
if (i != khotkeys_screen_number && fork() == 0) {
@@ -137,7 +137,7 @@ int KDE_EXPORT kdemain( int argc, char** argv )
}
}
- QCString appname;
+ TQCString appname;
if (khotkeys_screen_number == 0)
appname = "khotkeys";
else
diff --git a/khotkeys/app/app.h b/khotkeys/app/app.h
index 6166276cb..e23edfcb1 100644
--- a/khotkeys/app/app.h
+++ b/khotkeys/app/app.h
@@ -31,7 +31,7 @@ class KHotKeysApp
virtual ~KHotKeysApp();
private:
Action_data_group* actions_root;
- QObject* delete_helper;
+ TQObject* delete_helper;
};
//***************************************************************************
diff --git a/khotkeys/app/kded.cpp b/khotkeys/app/kded.cpp
index 08c9bb487..3ebb55575 100644
--- a/khotkeys/app/kded.cpp
+++ b/khotkeys/app/kded.cpp
@@ -34,7 +34,7 @@
#include <voices.h>
extern "C"
-KDE_EXPORT KDEDModule *create_khotkeys( const QCString& obj )
+KDE_EXPORT KDEDModule *create_khotkeys( const TQCString& obj )
{
return new KHotKeys::KHotKeysModule( obj );
}
@@ -44,7 +44,7 @@ namespace KHotKeys
// KhotKeysModule
-KHotKeysModule::KHotKeysModule( const QCString& obj )
+KHotKeysModule::KHotKeysModule( const TQCString& obj )
: KDEDModule( obj )
{
for( int i = 0;
@@ -53,8 +53,8 @@ KHotKeysModule::KHotKeysModule( const QCString& obj )
{
if( kapp->dcopClient()->isApplicationRegistered( "khotkeys" ))
{
- QByteArray data, replyData;
- QCString reply;
+ TQByteArray data, replyData;
+ TQCString reply;
// wait for it to finish
kapp->dcopClient()->call( "khotkeys*", "khotkeys", "quit()", data, reply, replyData );
sleep( 1 );
diff --git a/khotkeys/app/kded.h b/khotkeys/app/kded.h
index f136cd6a0..c0a1526ee 100644
--- a/khotkeys/app/kded.h
+++ b/khotkeys/app/kded.h
@@ -28,7 +28,7 @@ class KHotKeysModule
ASYNC reread_configuration();
ASYNC quit();
public:
- KHotKeysModule( const QCString& obj );
+ KHotKeysModule( const TQCString& obj );
virtual ~KHotKeysModule();
private:
Action_data_group* actions_root;