summaryrefslogtreecommitdiffstats
path: root/ksmserver
diff options
context:
space:
mode:
Diffstat (limited to 'ksmserver')
-rw-r--r--ksmserver/legacy.cpp24
-rw-r--r--ksmserver/main.cpp4
-rw-r--r--ksmserver/server.cpp2
-rw-r--r--ksmserver/shutdowndlg.cpp6
-rw-r--r--ksmserver/startup.cpp8
5 files changed, 22 insertions, 22 deletions
diff --git a/ksmserver/legacy.cpp b/ksmserver/legacy.cpp
index ec0ace402..ecef6423b 100644
--- a/ksmserver/legacy.cpp
+++ b/ksmserver/legacy.cpp
@@ -92,7 +92,7 @@ void KSMServer::performLegacySessionSave()
Atom atoms[ 3 ];
const char* const names[]
= { "WM_SAVE_YOURSELF", "WM_PROTOCOLS", "WM_CLIENT_LEADER" };
- XInternAtoms( qt_xdisplay(), const_cast< char** >( names ), 3,
+ XInternAtoms( tqt_xdisplay(), const_cast< char** >( names ), 3,
False, atoms );
wm_save_yourself = atoms[ 0 ];
wm_protocols = atoms[ 1 ];
@@ -105,7 +105,7 @@ void KSMServer::performLegacySessionSave()
SMType wtype = SM_WMCOMMAND;
int nprotocols = 0;
Atom *protocols = 0;
- if( XGetWMProtocols(qt_xdisplay(), leader, &protocols, &nprotocols)) {
+ if( XGetWMProtocols(tqt_xdisplay(), leader, &protocols, &nprotocols)) {
for (int i=0; i<nprotocols; i++)
if (protocols[i] == wm_save_yourself) {
wtype = SM_WMSAVEYOURSELF;
@@ -116,7 +116,7 @@ void KSMServer::performLegacySessionSave()
SMData data;
data.type = wtype;
XClassHint classHint;
- if( XGetClassHint( qt_xdisplay(), leader, &classHint ) ) {
+ if( XGetClassHint( tqt_xdisplay(), leader, &classHint ) ) {
data.wmclass1 = classHint.res_name;
data.wmclass2 = classHint.res_class;
XFree( classHint.res_name );
@@ -126,8 +126,8 @@ void KSMServer::performLegacySessionSave()
}
}
// Open fresh display for sending WM_SAVE_YOURSELF
- XSync(qt_xdisplay(), False);
- Display *newdisplay = XOpenDisplay(DisplayString(qt_xdisplay()));
+ XSync(tqt_xdisplay(), False);
+ Display *newdisplay = XOpenDisplay(DisplayString(tqt_xdisplay()));
if (!newdisplay) {
windowMapPtr = NULL;
XSetErrorHandler(oldHandler);
@@ -194,7 +194,7 @@ void KSMServer::performLegacySessionSave()
XSync(newdisplay, False);
XCloseDisplay(newdisplay);
// Restore old error handler
- XSync(qt_xdisplay(), False);
+ XSync(tqt_xdisplay(), False);
XSetErrorHandler(oldHandler);
for (WindowMap::Iterator it = legacyWindows.begin(); it != legacyWindows.end(); ++it) {
if ( (*it).type != SM_ERROR) {
@@ -288,7 +288,7 @@ static TQCString getQCStringProperty(WId w, Atom prop)
unsigned long extra = 0;
unsigned char *data = 0;
TQCString result = "";
- status = XGetWindowProperty( qt_xdisplay(), w, prop, 0, 10000,
+ status = XGetWindowProperty( tqt_xdisplay(), w, prop, 0, 10000,
FALSE, XA_STRING, &type, &format,
&nitems, &extra, &data );
if ( status == Success) {
@@ -308,7 +308,7 @@ static TQStringList getQStringListProperty(WId w, Atom prop)
unsigned char *data = 0;
TQStringList result;
- status = XGetWindowProperty( qt_xdisplay(), w, prop, 0, 10000,
+ status = XGetWindowProperty( tqt_xdisplay(), w, prop, 0, 10000,
FALSE, XA_STRING, &type, &format,
&nitems, &extra, &data );
if ( status == Success) {
@@ -374,7 +374,7 @@ WId KSMServer::windowWmClientLeader(WId w)
unsigned long extra = 0;
unsigned char *data = 0;
Window result = w;
- status = XGetWindowProperty( qt_xdisplay(), w, wm_client_leader, 0, 10000,
+ status = XGetWindowProperty( tqt_xdisplay(), w, wm_client_leader, 0, 10000,
FALSE, XA_WINDOW, &type, &format,
&nitems, &extra, &data );
if (status == Success ) {
@@ -390,11 +390,11 @@ WId KSMServer::windowWmClientLeader(WId w)
Returns sessionId for this client,
taken either from its window or from the leader window.
*/
-extern Atom qt_sm_client_id;
+extern Atom tqt_sm_client_id;
TQCString KSMServer::windowSessionId(WId w, WId leader)
{
- TQCString result = getQCStringProperty(w, qt_sm_client_id);
+ TQCString result = getQCStringProperty(w, tqt_sm_client_id);
if (result.isEmpty() && leader != (WId)None && leader != w)
- result = getQCStringProperty(leader, qt_sm_client_id);
+ result = getQCStringProperty(leader, tqt_sm_client_id);
return result;
}
diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp
index b425cedc7..26b93dfd9 100644
--- a/ksmserver/main.cpp
+++ b/ksmserver/main.cpp
@@ -191,7 +191,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
putenv((char*)"SESSION_MANAGER=");
KApplication a(KApplication::openX11RGBADisplay(), false); // Disable styles until we need them.
- fcntl(ConnectionNumber(qt_xdisplay()), F_SETFD, 1);
+ fcntl(ConnectionNumber(tqt_xdisplay()), F_SETFD, 1);
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
@@ -228,7 +228,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
KConfig *config = KGlobal::config();
config->setGroup( "General" );
- int realScreenCount = ScreenCount( qt_xdisplay() );
+ int realScreenCount = ScreenCount( tqt_xdisplay() );
bool screenCountChanged =
( config->readNumEntry( "screenCount", realScreenCount ) != realScreenCount );
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index cacaabdfa..da6af4943 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -885,7 +885,7 @@ void KSMServer::storeSession()
config->writeEntry( "count", count );
config->setGroup("General");
- config->writeEntry( "screenCount", ScreenCount(qt_xdisplay()));
+ config->writeEntry( "screenCount", ScreenCount(tqt_xdisplay()));
storeLegacySession( config );
config->sync();
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index 9a7e4ef04..cf2985ade 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -95,7 +95,7 @@ KSMShutdownFeedback::KSMShutdownFeedback()
else {
// The hacks below aren't needed any more because Qt3 supports true transparency for the fading logout screen when composition is available
DCOPRef("kicker", "KMenu").call("hideMenu"); // Make sure the K Menu is completely removed from the screen before taking a snapshot...
- m_grayImage = TQPixmap(TQPixmap::grabWindow(qt_xrootwin(), 0, 0, TQApplication::desktop()->width(), TQApplication::desktop()->height())).convertToImage();
+ m_grayImage = TQPixmap(TQPixmap::grabWindow(tqt_xrootwin(), 0, 0, TQApplication::desktop()->width(), TQApplication::desktop()->height())).convertToImage();
}
m_unfadedImage = m_grayImage;
resize(0, 0);
@@ -500,13 +500,13 @@ void KSMShutdownFeedback::slotPaintEffect()
if ( m_currentY == 0 ) {
KPixmap pixmap;
- pixmap = TQPixmap(TQPixmap::grabWindow( qt_xrootwin(), 0, 0, width(), height() ));
+ pixmap = TQPixmap(TQPixmap::grabWindow( tqt_xrootwin(), 0, 0, width(), height() ));
bitBlt( this, 0, 0, &pixmap );
bitBlt( &m_root, 0, 0, &pixmap );
}
KPixmap pixmap;
- pixmap = TQPixmap(TQPixmap::grabWindow( qt_xrootwin(), 0, m_currentY, width(), 10 ));
+ pixmap = TQPixmap(TQPixmap::grabWindow( tqt_xrootwin(), 0, m_currentY, width(), 10 ));
TQImage image = pixmap.convertToImage();
KImageEffect::blend( Qt::black, image, 0.4 );
KImageEffect::toGray( image, true );
diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp
index eaee5f20c..7ef0fcc5f 100644
--- a/ksmserver/startup.cpp
+++ b/ksmserver/startup.cpp
@@ -467,13 +467,13 @@ void KSMServer::upAndRunning( const TQString& msg )
DCOPRef( "ksplash" ).send( "upAndRunning", msg );
XEvent e;
e.xclient.type = ClientMessage;
- e.xclient.message_type = XInternAtom( qt_xdisplay(), "_KDE_SPLASH_PROGRESS", False );
- e.xclient.display = qt_xdisplay();
- e.xclient.window = qt_xrootwin();
+ e.xclient.message_type = XInternAtom( tqt_xdisplay(), "_KDE_SPLASH_PROGRESS", False );
+ e.xclient.display = tqt_xdisplay();
+ e.xclient.window = tqt_xrootwin();
e.xclient.format = 8;
assert( strlen( msg.latin1()) < 20 );
strcpy( e.xclient.data.b, msg.latin1());
- XSendEvent( qt_xdisplay(), qt_xrootwin(), False, SubstructureNotifyMask, &e );
+ XSendEvent( tqt_xdisplay(), tqt_xrootwin(), False, SubstructureNotifyMask, &e );
}
// these two are in the DCOP interface but I have no idea what uses them
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 12:47:43 +0000