summaryrefslogtreecommitdiffstats
path: root/ksmserver/server.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
commitfd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch)
tree9eda848e56fcb862fdfdf479adeccd95b6fe387a /ksmserver/server.cpp
parent02f67d0e1355b79b1806746efb0f2f640e57f13d (diff)
downloadtdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz
tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'ksmserver/server.cpp')
-rw-r--r--ksmserver/server.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index e5fef2f84..d98faf09a 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -154,7 +154,7 @@ static Bool HostBasedAuthProc ( char* /*hostname*/)
}
-tqStatus KSMRegisterClientProc (
+Status KSMRegisterClientProc (
SmsConn /* smsConn */,
SmPointer managerData,
char * previousId
@@ -297,7 +297,7 @@ void KSMGetPropertiesProc (
}
-class KSMListener : public TQSocketNotifier
+class KSMListener : public QSocketNotifier
{
public:
KSMListener( IceListenObj obj )
@@ -310,7 +310,7 @@ public:
IceListenObj listenObj;
};
-class KSMConnection : public TQSocketNotifier
+class KSMConnection : public QSocketNotifier
{
public:
KSMConnection( IceConn conn )
@@ -360,7 +360,7 @@ static void write_iceauth (FILE *addfp, FILE *removefp, IceAuthDataEntry *entry)
#define MAGIC_COOKIE_LEN 16
-tqStatus SetAuthentication_local (int count, IceListenObj *listenObjs)
+Status SetAuthentication_local (int count, IceListenObj *listenObjs)
{
int i;
for (i = 0; i < count; i ++) {
@@ -387,7 +387,7 @@ tqStatus SetAuthentication_local (int count, IceListenObj *listenObjs)
return 1;
}
-tqStatus SetAuthentication (int count, IceListenObj *listenObjs,
+Status SetAuthentication (int count, IceListenObj *listenObjs,
IceAuthDataEntry **authDataEntries)
{
KTempFile addAuthFile;
@@ -532,8 +532,8 @@ void KSMWatchProc ( IceConn iceConn, IcePointer client_data, Bool opening, IcePo
}
}
-static tqStatus KSMNewClientProc ( SmsConn conn, SmPointer manager_data,
- unsigned long* tqmask_ret, SmsCallbacks* cb, char** failure_reason_ret)
+static Status KSMNewClientProc ( SmsConn conn, SmPointer manager_data,
+ unsigned long* mask_ret, SmsCallbacks* cb, char** failure_reason_ret)
{
*failure_reason_ret = 0;
@@ -560,7 +560,7 @@ static tqStatus KSMNewClientProc ( SmsConn conn, SmPointer manager_data,
cb->get_properties.callback = KSMGetPropertiesProc;
cb->get_properties.manager_data = client;
- *tqmask_ret = SmsRegisterClientProcMask |
+ *mask_ret = SmsRegisterClientProcMask |
SmsInteractRequestProcMask |
SmsInteractDoneProcMask |
SmsSaveYourselfRequestProcMask |
@@ -632,7 +632,7 @@ KSMServer::KSMServer( const TQString& windowManager, bool _only_local )
TQCString fName = TQFile::encodeName(locateLocal("socket", "KSMserver"));
TQCString display = ::getenv("DISPLAY");
// strip the screen number from the display
- display.tqreplace(TQRegExp("\\.[0-9]+$"), "");
+ display.replace(TQRegExp("\\.[0-9]+$"), "");
int i;
while( (i = display.find(':')) >= 0)
display[i] = '_';
@@ -697,7 +697,7 @@ void KSMServer::cleanUp()
TQCString fName = TQFile::encodeName(locateLocal("socket", "KSMserver"));
TQCString display = ::getenv("DISPLAY");
// strip the screen number from the display
- display.tqreplace(TQRegExp("\\.[0-9]+$"), "");
+ display.replace(TQRegExp("\\.[0-9]+$"), "");
int i;
while( (i = display.find(':')) >= 0)
display[i] = '_';
@@ -868,7 +868,7 @@ void KSMServer::storeSession()
TQStringList restartCommand = c->restartCommand();
if (program.isEmpty() && restartCommand.isEmpty())
continue;
- if (excludeApps.tqcontains( program.lower()))
+ if (excludeApps.contains( program.lower()))
continue;
count++;
@@ -911,7 +911,7 @@ bool KSMServer::isWM( const TQString& program ) const
{
// KWin relies on ksmserver's special treatment in phase1,
// therefore make sure it's recognized even if ksmserver
- // was initially started with different WM, and kwin tqreplaced
+ // was initially started with different WM, and kwin replaced
// it later
return program == wm || program == "kwin";
}