diff options
Diffstat (limited to 'ksmserver')
| -rw-r--r-- | ksmserver/README | 2 | ||||
| -rw-r--r-- | ksmserver/client.cpp | 8 | ||||
| -rw-r--r-- | ksmserver/legacy.cpp | 10 | ||||
| -rw-r--r-- | ksmserver/main.cpp | 4 | ||||
| -rw-r--r-- | ksmserver/server.cpp | 24 | ||||
| -rw-r--r-- | ksmserver/server.h | 2 | ||||
| -rw-r--r-- | ksmserver/shutdown.cpp | 4 | ||||
| -rw-r--r-- | ksmserver/shutdowndlg.cpp | 30 | ||||
| -rw-r--r-- | ksmserver/startup.cpp | 6 | ||||
| -rw-r--r-- | ksmserver/timed.ui | 32 |
10 files changed, 61 insertions, 61 deletions
diff --git a/ksmserver/README b/ksmserver/README index 1c74111ae..818005c4f 100644 --- a/ksmserver/README +++ b/ksmserver/README @@ -38,7 +38,7 @@ usually restarted when the session is restored. To be *really* sure that this happens, even if the wm might have crashed during the previous session, ksmserver ensures that. The option specifies, which windowmanager shall be launched for sure. But again: if the stored -session contains a window manager, the restored one will be used, not +session tqcontains a window manager, the restored one will be used, not the specified one. As a special feature, ksmserver always starts the specified window manager first, which results in a much nicer startup sequence (less flashy). diff --git a/ksmserver/client.cpp b/ksmserver/client.cpp index 2f6708963..b1927890a 100644 --- a/ksmserver/client.cpp +++ b/ksmserver/client.cpp @@ -146,7 +146,7 @@ TQString KSMClient::program() const SmProp* p = property( SmProgram ); if ( !p || qstrcmp( p->type, SmARRAY8) || p->num_vals < 1) return TQString::null; - return TQString::fromLatin1( (const char*) p->vals[0].value ); + return TQString::tqfromLatin1( (const char*) p->vals[0].value ); } TQStringList KSMClient::restartCommand() const @@ -156,7 +156,7 @@ TQStringList KSMClient::restartCommand() const if ( !p || qstrcmp( p->type, SmLISTofARRAY8) || p->num_vals < 1) return result; for ( int i = 0; i < p->num_vals; i++ ) - result +=TQString::fromLatin1( (const char*) p->vals[i].value ); + result +=TQString::tqfromLatin1( (const char*) p->vals[i].value ); return result; } @@ -167,7 +167,7 @@ TQStringList KSMClient::discardCommand() const if ( !p || qstrcmp( p->type, SmLISTofARRAY8) || p->num_vals < 1) return result; for ( int i = 0; i < p->num_vals; i++ ) - result +=TQString::fromLatin1( (const char*) p->vals[i].value ); + result +=TQString::tqfromLatin1( (const char*) p->vals[i].value ); return result; } @@ -184,7 +184,7 @@ TQString KSMClient::userId() const SmProp* p = property( SmUserID ); if ( !p || qstrcmp( p->type, SmARRAY8) || p->num_vals < 1) return TQString::null; - return TQString::fromLatin1( (const char*) p->vals[0].value ); + return TQString::tqfromLatin1( (const char*) p->vals[0].value ); } diff --git a/ksmserver/legacy.cpp b/ksmserver/legacy.cpp index 773cd514d..3d908f6fd 100644 --- a/ksmserver/legacy.cpp +++ b/ksmserver/legacy.cpp @@ -103,7 +103,7 @@ void KSMServer::performLegacySessionSave() for ( TQValueList<WId>::ConstIterator it = module.windows().begin(); it != module.windows().end(); ++it) { WId leader = windowWmClientLeader( *it ); - if (!legacyWindows.contains(leader) && windowSessionId( *it, leader ).isEmpty()) { + if (!legacyWindows.tqcontains(leader) && windowSessionId( *it, leader ).isEmpty()) { SMType wtype = SM_WMCOMMAND; int nprotocols = 0; Atom *protocols = 0; @@ -219,8 +219,8 @@ void KSMServer::storeLegacySession( KConfig* config ) int count = 0; for (WindowMap::ConstIterator it = legacyWindows.begin(); it != legacyWindows.end(); ++it) { if ( (*it).type != SM_ERROR) { - if( excludeApps.contains( (*it).wmclass1.lower()) - || excludeApps.contains( (*it).wmclass2.lower()) || (*it).wmCommand[0] == "compiz" || (*it).wmCommand[0] == "beryl" || (*it).wmCommand[0] == "aquamarine" || (*it).wmCommand[0] == "beryl-manager" || (*it).wmCommand[0] == "beryl-settings" || (*it).wmCommand[0] == "kde-window-decorator" || (*it).wmCommand[0] == "emerald") + if( excludeApps.tqcontains( (*it).wmclass1.lower()) + || excludeApps.tqcontains( (*it).wmclass2.lower()) || (*it).wmCommand[0] == "compiz" || (*it).wmCommand[0] == "beryl" || (*it).wmCommand[0] == "aquamarine" || (*it).wmCommand[0] == "beryl-manager" || (*it).wmCommand[0] == "beryl-settings" || (*it).wmCommand[0] == "kde-window-decorator" || (*it).wmCommand[0] == "emerald") continue; if ( !(*it).wmCommand.isEmpty() && !(*it).wmClientMachine.isEmpty() ) { count++; @@ -317,7 +317,7 @@ static TQStringList getQStringListProperty(WId w, Atom prop) if (!data) return result; for (int i=0; i<(int)nitems; i++) { - result << TQString::fromLatin1( (const char*)data + i ); + result << TQString::tqfromLatin1( (const char*)data + i ); while(data[i]) i++; } XFree(data); @@ -365,7 +365,7 @@ TQString KSMServer::windowWmClientMachine(WId w) } } } - return TQString::fromLatin1(result); + return TQString::tqfromLatin1(result); } WId KSMServer::windowWmClientLeader(WId w) diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp index d41cfc1fa..797edae96 100644 --- a/ksmserver/main.cpp +++ b/ksmserver/main.cpp @@ -170,7 +170,7 @@ void sanity_check( int argc, char* argv[] ) qmsg.sprintf(msg.data(), path.data()); qmsg = msg_pre+qmsg+msg_post; TQMessageBox::critical(0, "KDE Installation Problem!", - TQString::fromLatin1(qmsg.data())); + TQString::tqfromLatin1(qmsg.data())); exit(255); } } @@ -218,7 +218,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] ) only_local = false; #endif - KSMServer *server = new KSMServer( TQString::fromLatin1(wm), only_local); + KSMServer *server = new KSMServer( TQString::tqfromLatin1(wm), only_local); kapp->dcopClient()->setDefaultObject( server->objId() ); IceSetIOErrorHandler( IoErrorHandler ); diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp index d98faf09a..e5fef2f84 100644 --- a/ksmserver/server.cpp +++ b/ksmserver/server.cpp @@ -154,7 +154,7 @@ static Bool HostBasedAuthProc ( char* /*hostname*/) } -Status KSMRegisterClientProc ( +tqStatus KSMRegisterClientProc ( SmsConn /* smsConn */, SmPointer managerData, char * previousId @@ -297,7 +297,7 @@ void KSMGetPropertiesProc ( } -class KSMListener : public QSocketNotifier +class KSMListener : public TQSocketNotifier { public: KSMListener( IceListenObj obj ) @@ -310,7 +310,7 @@ public: IceListenObj listenObj; }; -class KSMConnection : public QSocketNotifier +class KSMConnection : public TQSocketNotifier { public: KSMConnection( IceConn conn ) @@ -360,7 +360,7 @@ static void write_iceauth (FILE *addfp, FILE *removefp, IceAuthDataEntry *entry) #define MAGIC_COOKIE_LEN 16 -Status SetAuthentication_local (int count, IceListenObj *listenObjs) +tqStatus SetAuthentication_local (int count, IceListenObj *listenObjs) { int i; for (i = 0; i < count; i ++) { @@ -387,7 +387,7 @@ Status SetAuthentication_local (int count, IceListenObj *listenObjs) return 1; } -Status SetAuthentication (int count, IceListenObj *listenObjs, +tqStatus SetAuthentication (int count, IceListenObj *listenObjs, IceAuthDataEntry **authDataEntries) { KTempFile addAuthFile; @@ -532,8 +532,8 @@ void KSMWatchProc ( IceConn iceConn, IcePointer client_data, Bool opening, IcePo } } -static Status KSMNewClientProc ( SmsConn conn, SmPointer manager_data, - unsigned long* mask_ret, SmsCallbacks* cb, char** failure_reason_ret) +static tqStatus KSMNewClientProc ( SmsConn conn, SmPointer manager_data, + unsigned long* tqmask_ret, SmsCallbacks* cb, char** failure_reason_ret) { *failure_reason_ret = 0; @@ -560,7 +560,7 @@ static Status KSMNewClientProc ( SmsConn conn, SmPointer manager_data, cb->get_properties.callback = KSMGetPropertiesProc; cb->get_properties.manager_data = client; - *mask_ret = SmsRegisterClientProcMask | + *tqmask_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.replace(TQRegExp("\\.[0-9]+$"), ""); + display.tqreplace(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.replace(TQRegExp("\\.[0-9]+$"), ""); + display.tqreplace(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.contains( program.lower())) + if (excludeApps.tqcontains( 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 replaced + // was initially started with different WM, and kwin tqreplaced // it later return program == wm || program == "kwin"; } diff --git a/ksmserver/server.h b/ksmserver/server.h index 0fc900042..ac6b1fd81 100644 --- a/ksmserver/server.h +++ b/ksmserver/server.h @@ -93,7 +93,7 @@ public: virtual void suspendStartup( TQCString app ); virtual void resumeStartup( TQCString app ); - bool checkStatus( bool &logoutConfirmed, bool &maysd, + bool checktqStatus( bool &logoutConfirmed, bool &maysd, KApplication::ShutdownConfirm confirm, KApplication::ShutdownType sdtype, KApplication::ShutdownMode sdmode ); diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp index a850d40be..80521b7b0 100644 --- a/ksmserver/shutdown.cpp +++ b/ksmserver/shutdown.cpp @@ -93,7 +93,7 @@ void KSMServer::logout( int confirm, int sdtype, int sdmode ) (KApplication::ShutdownMode)sdmode ); } -bool KSMServer::checkStatus( bool &logoutConfirmed, bool &maysd, +bool KSMServer::checktqStatus( bool &logoutConfirmed, bool &maysd, KApplication::ShutdownConfirm confirm, KApplication::ShutdownType sdtype, KApplication::ShutdownMode sdmode ) @@ -144,7 +144,7 @@ void KSMServer::shutdownInternal( KApplication::ShutdownConfirm confirm, { bool maysd = false; bool logoutConfirmed = false; - if ( !checkStatus( logoutConfirmed, maysd, confirm, sdtype, sdmode ) ) + if ( !checktqStatus( logoutConfirmed, maysd, confirm, sdtype, sdmode ) ) return; KConfig *config = KGlobal::config(); diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp index 0c7211efd..44f2612d7 100644 --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp @@ -118,7 +118,7 @@ void KSMShutdownFeedback::slotPaintEffect() { m_greyImageCreated = true; setBackgroundMode( TQWidget::NoBackground ); - setGeometry( TQApplication::desktop()->geometry() ); + setGeometry( TQApplication::desktop()->tqgeometry() ); m_root.resize( width(), height() ); // for the default logout m_unfadedImage = m_grayImage.copy(); @@ -274,7 +274,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, TQFrame* frame = new TQFrame( this ); frame->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised ); - frame->setLineWidth( style().pixelMetric( TQStyle::PM_DefaultFrameWidth, frame ) ); + frame->setLineWidth( style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, frame ) ); // we need to set the minimum size for the logout box, since it // gets too small if there isn't all options available frame->setMinimumWidth(400); @@ -301,7 +301,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, vbox->addWidget( label, 0, AlignHCenter ); } - // for the basic layout, within this box either the ubuntu dialog or + // for the basic tqlayout, within this box either the ubuntu dialog or // standard konqy+buttons will be placed. TQHBoxLayout* hbox = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() ); @@ -315,7 +315,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, { // first line of buttons hbuttonbox = new TQHBoxLayout( hbox, factor * KDialog::spacingHint() ); - hbuttonbox->setAlignment( Qt::AlignHCenter ); + hbuttonbox->tqsetAlignment( Qt::AlignHCenter ); // End session FlatButton* btnLogout = new FlatButton( frame ); btnLogout->setTextLabel( TQString("&") + i18n("Log out"), false ); @@ -335,12 +335,12 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, hbox->addWidget( lfrm, AlignCenter ); buttonlay = new TQVBoxLayout( hbox, factor * KDialog::spacingHint() ); - buttonlay->setAlignment( Qt::AlignHCenter ); + buttonlay->tqsetAlignment( Qt::AlignHCenter ); TQLabel* icon = new TQLabel( lfrm ); icon->setPixmap( UserIcon( "shutdownkonq" ) ); - lfrm->setFixedSize( icon->sizeHint()); - icon->setFixedSize( icon->sizeHint()); + lfrm->setFixedSize( icon->tqsizeHint()); + icon->setFixedSize( icon->tqsizeHint()); buttonlay->addStretch( 1 ); // End session @@ -454,7 +454,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, // bottom buttons TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() ); - hbuttonbox2->setAlignment( Qt::AlignHCenter ); + hbuttonbox2->tqsetAlignment( Qt::AlignHCenter ); // Reboot FlatButton* btnReboot = new FlatButton( frame ); @@ -479,7 +479,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, for (TQStringList::ConstIterator it = rebootOptions.begin(); it != rebootOptions.end(); ++it, ++index) { TQString label = (*it); - label=label.replace('&',"&&"); + label=label.tqreplace('&',"&&"); if (index == cur) targets->insertItem( label + i18n("current option in boot loader", " (current)"), index); else @@ -504,7 +504,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, // cancel buttonbox TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() ); - hbuttonbox3->setAlignment( Qt::AlignRight ); + hbuttonbox3->tqsetAlignment( Qt::AlignRight ); // Back to Desktop KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame ); @@ -544,7 +544,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, for (TQStringList::ConstIterator it = rebootOptions.begin(); it != rebootOptions.end(); ++it, ++index) { TQString label = (*it); - label=label.replace('&',"&&"); + label=label.tqreplace('&',"&&"); if (index == cur) targets->insertItem( label + i18n("current option in boot loader", " (current)"), index); else @@ -591,7 +591,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, { // cancel buttonbox TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() ); - hbuttonbox3->setAlignment( Qt::AlignRight ); + hbuttonbox3->tqsetAlignment( Qt::AlignRight ); // Back to Desktop KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame ); @@ -716,7 +716,7 @@ bool KSMShutdownDlg::confirmShutdown( bool maysd, KApplication::ShutdownType& sd maysd, sdtype ); // Show dialog (will save the background in showEvent) - TQSize sh = l->sizeHint(); + TQSize sh = l->tqsizeHint(); TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos()); l->move(rect.x() + (rect.width() - sh.width())/2, @@ -798,7 +798,7 @@ KSMDelayedMessageBox::KSMDelayedMessageBox( KApplication::ShutdownType sdtype, c adjustSize(); if ( double( height() ) / width() < 0.25 ) { - setFixedHeight( qRound( width() * 0.3 ) ); + setFixedHeight( tqRound( width() * 0.3 ) ); adjustSize(); } TQTimer *timer = new TQTimer( this ); @@ -822,7 +822,7 @@ bool KSMDelayedMessageBox::showTicker( KApplication::ShutdownType sdtype, const { kapp->enableStyles(); KSMDelayedMessageBox msg( sdtype, bootOption, confirmDelay ); - TQSize sh = msg.sizeHint(); + TQSize sh = msg.tqsizeHint(); TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos()); msg.move(rect.x() + (rect.width() - sh.width())/2, diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp index 2778b9dd9..57cec37fb 100644 --- a/ksmserver/startup.cpp +++ b/ksmserver/startup.cpp @@ -267,7 +267,7 @@ void KSMServer::tryRestoreNext() if ( wm == config->readEntry( TQString("program")+n ) ) continue; // wm already started if( config->readBoolEntry( TQString( "wasWm" )+n, false )) - continue; // it was wm before, but not now, don't run it (some have --replace in command :( ) + continue; // it was wm before, but not now, don't run it (some have --tqreplace in command :( ) startApplication( restartCommand, config->readEntry( TQString("clientMachine")+n ), config->readEntry( TQString("userId")+n )); @@ -363,14 +363,14 @@ bool KSMServer::checkStartupSuspend() void KSMServer::suspendStartup( TQCString app ) { - if( !startupSuspendCount.contains( app )) + if( !startupSuspendCount.tqcontains( app )) startupSuspendCount[ app ] = 0; ++startupSuspendCount[ app ]; } void KSMServer::resumeStartup( TQCString app ) { - if( !startupSuspendCount.contains( app )) + if( !startupSuspendCount.tqcontains( app )) return; if( --startupSuspendCount[ app ] == 0 ) { startupSuspendCount.remove( app ); diff --git a/ksmserver/timed.ui b/ksmserver/timed.ui index 23d7aa2a0..b048463f5 100644 --- a/ksmserver/timed.ui +++ b/ksmserver/timed.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>TimedLogoutDlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -66,7 +66,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <vbox> <property name="name"> @@ -80,7 +80,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> @@ -88,7 +88,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <vbox> <property name="name"> @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>2</height> @@ -129,7 +129,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>48</width> <height>48</height> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>2</height> @@ -160,7 +160,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <vbox> <property name="name"> @@ -192,7 +192,7 @@ <property name="textFormat"> <enum>PlainText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> @@ -215,7 +215,7 @@ after X automatically.</string> <property name="textFormat"> <enum>RichText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -229,7 +229,7 @@ after X automatically.</string> <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>0</height> @@ -242,7 +242,7 @@ after X automatically.</string> </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> @@ -258,7 +258,7 @@ after X automatically.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>90</width> <height>20</height> @@ -286,7 +286,7 @@ after X automatically.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>90</width> <height>20</height> @@ -319,7 +319,7 @@ after X automatically.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>90</width> <height>20</height> @@ -348,5 +348,5 @@ after X automatically.</string> <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> |