summaryrefslogtreecommitdiffstats
path: root/ksmserver/shutdowndlg.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ksmserver/shutdowndlg.cpp')
-rw-r--r--ksmserver/shutdowndlg.cpp218
1 files changed, 47 insertions, 171 deletions
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index a794388c3..64bf4a407 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -105,7 +105,7 @@ KSMShutdownFeedback::KSMShutdownFeedback()
m_unfadedImage = m_grayImage;
resize(0, 0);
setShown(true);
- TQTimer::singleShot( 500, this, TQT_SLOT( slotPaintEffect() ) );
+ TQTimer::singleShot( 500, this, TQ_SLOT( slotPaintEffect() ) );
}
// called after stopping shutdown-feedback -> smooth fade-back to color-mode
@@ -243,7 +243,7 @@ void KSMShutdownFeedback::slotPaintEffect()
bitBlt( this, 0, start_y1, &img );
}
- TQTimer::singleShot( 5, this, TQT_SLOT( slotPaintEffect() ) );
+ TQTimer::singleShot( 5, this, TQ_SLOT( slotPaintEffect() ) );
}
else {
// if slotPaintEffect() is called first time, we have to initialize the gray image
@@ -370,7 +370,7 @@ void KSMShutdownFeedback::slotPaintEffect()
bitBlt( this, 0, start_y1, &img );
}
- TQTimer::singleShot( 5, this, TQT_SLOT( slotPaintEffect() ) );
+ TQTimer::singleShot( 5, this, TQ_SLOT( slotPaintEffect() ) );
}
}
else {
@@ -486,7 +486,7 @@ void KSMShutdownFeedback::slotPaintEffect()
bitBlt( this, 0, start_y1, &img );
}
- TQTimer::singleShot( 1, this, TQT_SLOT( slotPaintEffect() ) );
+ TQTimer::singleShot( 1, this, TQ_SLOT( slotPaintEffect() ) );
}
else {
if ( m_currentY >= height() ) {
@@ -511,13 +511,13 @@ void KSMShutdownFeedback::slotPaintEffect()
KPixmap pixmap;
pixmap = TQPixmap(TQPixmap::grabWindow( tqt_xrootwin(), 0, m_currentY, width(), 10 ));
TQImage image = pixmap.convertToImage();
- KImageEffect::blend( Qt::black, image, 0.4 );
+ KImageEffect::blend( TQt::black, image, 0.4 );
KImageEffect::toGray( image, true );
pixmap.convertFromImage( image );
bitBlt( this, 0, m_currentY, &pixmap );
bitBlt( &m_root, 0, m_currentY, &pixmap );
m_currentY += 10;
- TQTimer::singleShot( 1, this, TQT_SLOT( slotPaintEffect() ) );
+ TQTimer::singleShot( 1, this, TQ_SLOT( slotPaintEffect() ) );
}
}
}
@@ -529,7 +529,7 @@ void KSMShutdownFeedback::slotPaintEffect()
KSMShutdownIPFeedback * KSMShutdownIPFeedback::s_pSelf = 0L;
KSMShutdownIPFeedback::KSMShutdownIPFeedback()
-: TQWidget( 0L, "systemmodaldialogclass", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop ), m_timeout(0), m_isPainted(false), m_paintedFromSharedRootPixmap(false), m_sharedRootPixmap(NULL), mPixmapTimeout(0)
+: TQWidget( 0L, "systemmodaldialogclass", TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WStyle_StaysOnTop ), m_timeout(0), m_isPainted(false), m_paintedFromSharedRootPixmap(false), m_sharedRootPixmap(NULL), mPixmapTimeout(0)
{
setShown(false);
@@ -539,7 +539,7 @@ KSMShutdownIPFeedback::KSMShutdownIPFeedback()
m_sharedRootPixmap = new KRootPixmap(this);
m_sharedRootPixmap->setCustomPainting(true);
- connect(m_sharedRootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQT_SLOT(slotSetBackgroundPixmap(const TQPixmap &)));
+ connect(m_sharedRootPixmap, TQ_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQ_SLOT(slotSetBackgroundPixmap(const TQPixmap &)));
if (TQPaintDevice::x11AppDepth() == 32) {
// The shared pixmap is 24 bits, but we are 32 bits
@@ -571,13 +571,13 @@ void KSMShutdownIPFeedback::showNow()
if (!m_isPainted) {
setGeometry( TQApplication::desktop()->geometry() );
- TQTimer::singleShot( 0, this, SLOT(slotPaintEffect()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(slotPaintEffect()) );
}
}
void KSMShutdownIPFeedback::enableExports()
{
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
kdDebug(270) << k_lineinfo << "activating background exports.\n";
DCOPClient *client = kapp->dcopClient();
if (!client->isAttached()) {
@@ -632,7 +632,7 @@ void KSMShutdownIPFeedback::slotPaintEffect()
m_sharedRootPixmap->start();
}
- TQTimer::singleShot( 100, this, SLOT(slotPaintEffect()) );
+ TQTimer::singleShot( 100, this, TQ_SLOT(slotPaintEffect()) );
mPixmapTimeout++;
return;
}
@@ -647,13 +647,13 @@ void KSMShutdownIPFeedback::slotPaintEffect()
}
if ((pm.isNull()) || (pm.width() != kapp->desktop()->width()) || (pm.height() != kapp->desktop()->height())) {
if (mPixmapTimeout < 10) {
- TQTimer::singleShot( 100, this, SLOT(slotPaintEffect()) );
+ TQTimer::singleShot( 100, this, TQ_SLOT(slotPaintEffect()) );
mPixmapTimeout++;
return;
}
else {
pm = TQPixmap(kapp->desktop()->width(), kapp->desktop()->height());
- pm.fill(Qt::black);
+ pm.fill(TQt::black);
m_paintedFromSharedRootPixmap = false;
}
}
@@ -757,7 +757,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
{
// first line of buttons
hbuttonbox = new TQHBoxLayout( hbox, factor * KDialog::spacingHint() );
- hbuttonbox->setAlignment( Qt::AlignHCenter );
+ hbuttonbox->setAlignment( TQt::AlignHCenter );
// End session
FlatButton* btnLogout = new FlatButton( frame );
btnLogout->setTextLabel( TQString("&") + i18n("Log out"), false );
@@ -766,7 +766,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
int i = btnLogout->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1
btnLogout->setAccel( "ALT+" + btnLogout->textLabel().lower()[i+1] ) ;
hbuttonbox->addWidget ( btnLogout );
- connect(btnLogout, TQT_SIGNAL(clicked()), TQT_SLOT(slotLogout()));
+ connect(btnLogout, TQ_SIGNAL(clicked()), TQ_SLOT(slotLogout()));
}
else
{
@@ -776,7 +776,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
hbox->addWidget( lfrm, AlignCenter );
buttonlay = new TQVBoxLayout( hbox, factor * KDialog::spacingHint() );
- buttonlay->setAlignment( Qt::AlignHCenter );
+ buttonlay->setAlignment( TQt::AlignHCenter );
TQLabel* icon = new TQLabel( lfrm );
if (TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doNotUseKonqyPicture", false)) {
@@ -794,13 +794,9 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
TQToolTip::add( btnLogout, i18n( "<qt><p>Log out of the current session to login as a different user.</p></qt>" ) );
btnFont = btnLogout->font();
buttonlay->addWidget( btnLogout );
- connect(btnLogout, TQT_SIGNAL(clicked()), TQT_SLOT(slotLogout()));
+ connect(btnLogout, TQ_SIGNAL(clicked()), TQ_SLOT(slotLogout()));
}
-#ifdef COMPILE_HALBACKEND
- m_halCtx = NULL;
-#endif
-
if ((maysd) || (mayrb)) {
// respect lock on resume & disable suspend/hibernate settings
@@ -815,70 +811,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
bool canHibernate = false;
bool canHybridSuspend = false;
-#if defined(COMPILE_HALBACKEND)
- // Query HAL for suspend/resume support
- m_halCtx = libhal_ctx_new();
-
- DBusError error;
- dbus_error_init(&error);
- m_dbusConn = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error);
- if (!m_dbusConn)
- {
- dbus_error_free(&error);
- libhal_ctx_free(m_halCtx);
- m_halCtx = NULL;
- }
- else
- {
- dbus_bus_register(m_dbusConn, &error);
- if (dbus_error_is_set(&error))
- {
- dbus_error_free(&error);
- libhal_ctx_free(m_halCtx);
- m_dbusConn = NULL;
- m_halCtx = NULL;
- }
- else
- {
- libhal_ctx_set_dbus_connection(m_halCtx, m_dbusConn);
- if (!libhal_ctx_init(m_halCtx, &error))
- {
- if (dbus_error_is_set(&error))
- dbus_error_free(&error);
- libhal_ctx_free(m_halCtx);
- m_dbusConn = NULL;
- m_halCtx = NULL;
- }
- }
- }
-
- if (m_halCtx)
- {
- if (libhal_device_get_property_bool(m_halCtx,
- "/org/freedesktop/Hal/devices/computer",
- "power_management.can_suspend",
- NULL))
- {
- canSuspend = true;
- }
-
- if (libhal_device_get_property_bool(m_halCtx,
- "/org/freedesktop/Hal/devices/computer",
- "power_management.can_hibernate",
- NULL))
- {
- canHibernate = true;
- }
-
- if (libhal_device_get_property_bool(m_halCtx,
- "/org/freedesktop/Hal/devices/computer",
- "power_management.can_suspend_hybrid",
- NULL))
- {
- canHybridSuspend = true;
- }
- }
-#elif defined(WITH_TDEHWLIB) // COMPILE_HALBACKEND
+#if defined(WITH_TDEHWLIB)
TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();
if (rootDevice) {
canFreeze = rootDevice->canFreeze();
@@ -892,7 +825,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
canHibernate = false;
canHybridSuspend = false;
}
-#endif // COMPILE_HALBACKEND
+#endif
if(doUbuntuLogout) {
// Ubuntu style logout window
@@ -908,7 +841,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
int i = btnFreeze->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1
btnFreeze->setAccel( "ALT+" + btnFreeze->textLabel().lower()[i+1] ) ;
hbuttonbox->addWidget ( btnFreeze );
- connect(btnFreeze, TQT_SIGNAL(clicked()), TQT_SLOT(slotFreeze()));
+ connect(btnFreeze, TQ_SIGNAL(clicked()), TQ_SLOT(slotFreeze()));
}
if (canSuspend && !disableSuspend)
@@ -924,7 +857,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
int i = btnSuspend->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1
btnSuspend->setAccel( "ALT+" + btnSuspend->textLabel().lower()[i+1] ) ;
hbuttonbox->addWidget ( btnSuspend );
- connect(btnSuspend, TQT_SIGNAL(clicked()), TQT_SLOT(slotSuspend()));
+ connect(btnSuspend, TQ_SIGNAL(clicked()), TQ_SLOT(slotSuspend()));
}
if (canHibernate && !disableHibernate)
@@ -939,7 +872,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
int i = btnHibernate->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1
btnHibernate->setAccel( "ALT+" + btnHibernate->textLabel().lower()[i+1] ) ;
hbuttonbox->addWidget ( btnHibernate );
- connect(btnHibernate, TQT_SIGNAL(clicked()), TQT_SLOT(slotHibernate()));
+ connect(btnHibernate, TQ_SIGNAL(clicked()), TQ_SLOT(slotHibernate()));
}
if (canHybridSuspend && !disableSuspend && !disableHibernate)
@@ -957,7 +890,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
int i = btnHybridSuspend->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1
btnHybridSuspend->setAccel( "ALT+" + btnHybridSuspend->textLabel().lower()[i+1] ) ;
hbuttonbox->addWidget ( btnHybridSuspend );
- connect(btnHybridSuspend, TQT_SIGNAL(clicked()), TQT_SLOT(slotHybridSuspend()));
+ connect(btnHybridSuspend, TQ_SIGNAL(clicked()), TQ_SLOT(slotHybridSuspend()));
}
// Separator (within buttonlay)
@@ -965,7 +898,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
// bottom buttons
TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() );
- hbuttonbox2->setAlignment( Qt::AlignHCenter );
+ hbuttonbox2->setAlignment( TQt::AlignHCenter );
if (mayrb) {
// Reboot
@@ -976,7 +909,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
int i = btnReboot->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1
btnReboot->setAccel( "ALT+" + btnReboot->textLabel().lower()[i+1] ) ;
hbuttonbox2->addWidget ( btnReboot);
- connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()));
+ connect(btnReboot, TQ_SIGNAL(clicked()), TQ_SLOT(slotReboot()));
if ( sdtype == TDEApplication::ShutdownTypeReboot ) {
btnReboot->setFocus();
}
@@ -1003,7 +936,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
}
btnReboot->setPopup(targets);
- connect( targets, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReboot(int)) );
+ connect( targets, TQ_SIGNAL(activated(int)), TQ_SLOT(slotReboot(int)) );
}
// BAD KARMA .. this code is copied line by line from standard konqy dialog [EOF]
}
@@ -1017,7 +950,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
int i = btnHalt->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1
btnHalt->setAccel( "ALT+" + btnHalt->textLabel().lower()[i+1] ) ;
hbuttonbox2->addWidget ( btnHalt );
- connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()));
+ connect(btnHalt, TQ_SIGNAL(clicked()), TQ_SLOT(slotHalt()));
if ( sdtype == TDEApplication::ShutdownTypeHalt ) {
btnHalt->setFocus();
}
@@ -1025,12 +958,12 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
// cancel buttonbox
TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() );
- hbuttonbox3->setAlignment( Qt::AlignRight );
+ hbuttonbox3->setAlignment( TQt::AlignRight );
// Back to Desktop
KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame );
hbuttonbox3->addWidget( btnBack );
- connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
+ connect(btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
}
else
@@ -1042,7 +975,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
TQToolTip::add( btnHalt, i18n( "<qt><p>Log out of the current session and turn off the computer.</p></qt>" ) );
btnHalt->setFont( btnFont );
buttonlay->addWidget( btnHalt );
- connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()));
+ connect(btnHalt, TQ_SIGNAL(clicked()), TQ_SLOT(slotHalt()));
if ( sdtype == TDEApplication::ShutdownTypeHalt || getenv("TDM_AUTOLOGIN") ) {
btnHalt->setFocus();
}
@@ -1055,7 +988,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
btnReboot->setFont( btnFont );
buttonlay->addWidget( btnReboot );
- connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()));
+ connect(btnReboot, TQ_SIGNAL(clicked()), TQ_SLOT(slotReboot()));
if ( sdtype == TDEApplication::ShutdownTypeReboot ) {
btnReboot->setFocus();
}
@@ -1081,7 +1014,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
}
btnReboot->setPopup(targets);
- connect( targets, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReboot(int)) );
+ connect( targets, TQ_SIGNAL(activated(int)), TQ_SLOT(slotReboot(int)) );
}
}
@@ -1093,7 +1026,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
" almost instantly.</p><p>This correspond to ACPI S0 mode.</p></qt>"));
btnFreeze->setFont( btnFont );
buttonlay->addWidget( btnFreeze );
- connect(btnFreeze, TQT_SIGNAL(clicked()), TQT_SLOT(slotFreeze()));
+ connect(btnFreeze, TQ_SIGNAL(clicked()), TQ_SLOT(slotFreeze()));
}
if (canSuspend && !disableSuspend)
@@ -1105,7 +1038,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
"<p>Also known as Suspend-to-RAM mode.</p></qt>"));
btnSuspend->setFont( btnFont );
buttonlay->addWidget( btnSuspend );
- connect(btnSuspend, TQT_SIGNAL(clicked()), TQT_SLOT(slotSuspend()));
+ connect(btnSuspend, TQ_SIGNAL(clicked()), TQ_SLOT(slotSuspend()));
}
if (canHibernate && !disableHibernate)
@@ -1116,7 +1049,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
" considerable time is required to reactivate the system again.</p><p>This correspond to ACPI S4 mode.</p><p>Also known as Suspend-to-Disk mode.</p></qt>"));
btnHibernate->setFont( btnFont );
buttonlay->addWidget( btnHibernate );
- connect(btnHibernate, TQT_SIGNAL(clicked()), TQT_SLOT(slotHibernate()));
+ connect(btnHibernate, TQ_SIGNAL(clicked()), TQ_SLOT(slotHibernate()));
}
if (canHybridSuspend && !disableSuspend && !disableHibernate)
@@ -1130,7 +1063,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
"<p>Also known as Suspend-to-RAM + Suspend-to-Disk mode.</p></qt>"));
btnHybridSuspend->setFont( btnFont );
buttonlay->addWidget( btnHybridSuspend );
- connect(btnHybridSuspend, TQT_SIGNAL(clicked()), TQT_SLOT(slotHybridSuspend()));
+ connect(btnHybridSuspend, TQ_SIGNAL(clicked()), TQ_SLOT(slotHybridSuspend()));
}
buttonlay->addStretch( 1 );
@@ -1141,7 +1074,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
// Back to Desktop
KPushButton* btnBack = new KPushButton( KStdGuiItem::cancel(), frame );
buttonlay->addWidget( btnBack );
- connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
+ connect(btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
}
}
else {
@@ -1150,13 +1083,13 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
{
// cancel buttonbox
TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() );
- hbuttonbox3->setAlignment( Qt::AlignRight );
+ hbuttonbox3->setAlignment( TQt::AlignRight );
// Back to Desktop
KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame );
hbuttonbox3->addWidget( btnBack );
- connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
+ connect(btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
}
else
{
@@ -1167,7 +1100,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
KPushButton* btnBack = new KPushButton( KStdGuiItem::cancel(), frame );
buttonlay->addWidget( btnBack );
- connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
+ connect(btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
}
}
}
@@ -1175,15 +1108,6 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
KSMShutdownDlg::~KSMShutdownDlg()
{
-#ifdef COMPILE_HALBACKEND
- if (m_halCtx)
- {
- DBusError error;
- dbus_error_init(&error);
- libhal_ctx_shutdown(m_halCtx, &error);
- libhal_ctx_free(m_halCtx);
- }
-#endif
}
@@ -1220,46 +1144,13 @@ void KSMShutdownDlg::slotHalt()
void KSMShutdownDlg::slotSuspend()
{
-#ifndef COMPILE_HALBACKEND
*m_selection = SuspendType::Suspend;
-#else
- if (m_dbusConn)
- {
- DBusMessage *msg = dbus_message_new_method_call(
- "org.freedesktop.Hal",
- "/org/freedesktop/Hal/devices/computer",
- "org.freedesktop.Hal.Device.SystemPowerManagement",
- "Suspend");
-
- int wakeup=0;
- dbus_message_append_args(msg, DBUS_TYPE_INT32, &wakeup, DBUS_TYPE_INVALID);
-
- dbus_connection_send(m_dbusConn, msg, NULL);
-
- dbus_message_unref(msg);
- }
-#endif
reject(); // continue on resume
}
void KSMShutdownDlg::slotHibernate()
{
-#ifndef COMPILE_HALBACKEND
*m_selection = SuspendType::Hibernate;
-#else
- if (m_dbusConn)
- {
- DBusMessage *msg = dbus_message_new_method_call(
- "org.freedesktop.Hal",
- "/org/freedesktop/Hal/devices/computer",
- "org.freedesktop.Hal.Device.SystemPowerManagement",
- "Hibernate");
-
- dbus_connection_send(m_dbusConn, msg, NULL);
-
- dbus_message_unref(msg);
- }
-#endif
reject(); // continue on resume
}
@@ -1271,22 +1162,7 @@ void KSMShutdownDlg::slotFreeze()
void KSMShutdownDlg::slotHybridSuspend()
{
-#ifndef COMPILE_HALBACKEND
*m_selection = SuspendType::HybridSuspend;
-#else
- if (m_dbusConn)
- {
- DBusMessage *msg = dbus_message_new_method_call(
- "org.freedesktop.Hal",
- "/org/freedesktop/Hal/devices/computer",
- "org.freedesktop.Hal.Device.SystemPowerManagement",
- "SuspendHybrid");
-
- dbus_connection_send(m_dbusConn, msg, NULL);
-
- dbus_message_unref(msg);
- }
-#endif
reject(); // continue on resume
}
@@ -1370,8 +1246,8 @@ KSMShutdownIPDlg::KSMShutdownIPDlg(TQWidget* parent)
setNotificationActionButtonsSkipText(i18n("Skip Notification"));
m_button2->setText(i18n("Abort Logout"));
- connect(m_button1, SIGNAL(clicked()), this, SIGNAL(skipNotificationClicked()));
- connect(m_button2, SIGNAL(clicked()), this, SIGNAL(abortLogoutClicked()));
+ connect(m_button1, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(skipNotificationClicked()));
+ connect(m_button2, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(abortLogoutClicked()));
show();
setActiveWindow();
@@ -1388,10 +1264,10 @@ KSMDelayedPushButton::KSMDelayedPushButton( const KGuiItem &item,
const char *name)
: KPushButton( item, parent, name), pop(0), popt(0)
{
- connect(this, TQT_SIGNAL(pressed()), TQT_SLOT(slotPressed()));
- connect(this, TQT_SIGNAL(released()), TQT_SLOT(slotReleased()));
+ connect(this, TQ_SIGNAL(pressed()), TQ_SLOT(slotPressed()));
+ connect(this, TQ_SIGNAL(released()), TQ_SLOT(slotReleased()));
popt = new TQTimer(this);
- connect(popt, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
+ connect(popt, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()));
}
void KSMDelayedPushButton::setPopup(TQPopupMenu *p)
@@ -1453,7 +1329,7 @@ KSMDelayedMessageBox::KSMDelayedMessageBox( TDEApplication::ShutdownType sdtype,
}
TQTimer *timer = new TQTimer( this );
timer->start( 1000 );
- connect( timer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateText() ) );
+ connect( timer, TQ_SIGNAL( timeout() ), TQ_SLOT( updateText() ) );
KDialog::centerOnScreen(this);
}
@@ -1560,7 +1436,7 @@ void FlatButton::init()
setUsesBigPixmap(true);
setAutoRaise(true);
setTextPosition( TQToolButton::Under );
- setFocusPolicy(TQ_StrongFocus);
+ setFocusPolicy(TQWidget::StrongFocus);
}