diff options
Diffstat (limited to 'tdm/kfrontend')
34 files changed, 241 insertions, 195 deletions
diff --git a/tdm/kfrontend/CMakeLists.txt b/tdm/kfrontend/CMakeLists.txt index d150a32c9..05472b551 100644 --- a/tdm/kfrontend/CMakeLists.txt +++ b/tdm/kfrontend/CMakeLists.txt @@ -70,8 +70,8 @@ tde_add_executable( tdm_greet AUTOMOC tdm_greet.c tdmconfig.cpp tdmclock.cpp kconsole.cpp kfdialog.cpp kgdialog.cpp kchooser.cpp kgverify.cpp tdmshutdown.cpp tdmadmindialog.cpp kgreeter.cpp - kgapp.cpp sakdlg.cc - LINK tdmthemer-static tdeui-shared tdeio-shared dmctl-static Xtst ${LIBTDELDAP_LIBRARIES} ${TDMGREET_OPTIONAL_LINK} + kgapp.cpp sakdlg.cpp + LINK tdmthemer-static tdeui-shared tdeio-shared dmctl-static Xtst ${TDEHW_LIBRARIES} ${TDMGREET_OPTIONAL_LINK} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/tdm/kfrontend/kchooser.cpp b/tdm/kfrontend/kchooser.cpp index 9f0c714c0..876f42c88 100644 --- a/tdm/kfrontend/kchooser.cpp +++ b/tdm/kfrontend/kchooser.cpp @@ -75,7 +75,7 @@ ChooserDlg::ChooserDlg() iline->setEnabled( TRUE ); TQLabel *itxt = new TQLabel( iline, i18n("Hos&t:"), this ); TQPushButton *addButton = new TQPushButton( i18n("A&dd"), this ); - connect( addButton, TQT_SIGNAL(clicked()), TQT_SLOT(addHostname()) ); + connect( addButton, TQ_SIGNAL(clicked()), TQ_SLOT(addHostname()) ); TQBoxLayout *hibox = new TQHBoxLayout( vbox, 10 ); hibox->addWidget( itxt ); hibox->addWidget( iline ); @@ -106,13 +106,13 @@ ChooserDlg::ChooserDlg() vbox->addWidget( consoleView ); #endif - sn = new TQSocketNotifier( rfd, TQSocketNotifier::Read, TQT_TQOBJECT(this) ); - connect( sn, TQT_SIGNAL(activated( int )), TQT_SLOT(slotReadPipe()) ); + sn = new TQSocketNotifier( rfd, TQSocketNotifier::Read, this ); + connect( sn, TQ_SIGNAL(activated( int )), TQ_SLOT(slotReadPipe()) ); - connect( pingButton, TQT_SIGNAL(clicked()), TQT_SLOT(pingHosts()) ); - connect( acceptButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); -// connect( helpButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelp()) ); - connect( host_view, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(accept()) ); + connect( pingButton, TQ_SIGNAL(clicked()), TQ_SLOT(pingHosts()) ); + connect( acceptButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); +// connect( helpButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotHelp()) ); + connect( host_view, TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(accept()) ); adjustGeometry(); } diff --git a/tdm/kfrontend/kchooser.h b/tdm/kfrontend/kchooser.h index fcf14b1e1..1382ddd57 100644 --- a/tdm/kfrontend/kchooser.h +++ b/tdm/kfrontend/kchooser.h @@ -33,7 +33,7 @@ class TQListView; class TQListViewItem; class ChooserDlg : public KGDialog { - Q_OBJECT + TQ_OBJECT typedef KGDialog inherited; public: diff --git a/tdm/kfrontend/kconsole.cpp b/tdm/kfrontend/kconsole.cpp index bf1560aed..d47576c12 100644 --- a/tdm/kfrontend/kconsole.cpp +++ b/tdm/kfrontend/kconsole.cpp @@ -129,7 +129,7 @@ KConsole::OpenConsole() gotcon: notifier = new TQSocketNotifier( fd, TQSocketNotifier::Read, this ); - connect( notifier, TQT_SIGNAL(activated( int )), TQT_SLOT(slotData()) ); + connect( notifier, TQ_SIGNAL(activated( int )), TQ_SLOT(slotData()) ); return 1; } diff --git a/tdm/kfrontend/kconsole.h b/tdm/kfrontend/kconsole.h index 2b3e2aac3..04d197652 100644 --- a/tdm/kfrontend/kconsole.h +++ b/tdm/kfrontend/kconsole.h @@ -30,7 +30,7 @@ class TQSocketNotifier; class KPty; class KConsole : public TQTextEdit { - Q_OBJECT + TQ_OBJECT typedef TQTextEdit inherited; public: diff --git a/tdm/kfrontend/kfdialog.cpp b/tdm/kfrontend/kfdialog.cpp index 5e8f8e861..30ee85a00 100644 --- a/tdm/kfrontend/kfdialog.cpp +++ b/tdm/kfrontend/kfdialog.cpp @@ -178,10 +178,10 @@ KFMsgBox::KFMsgBox( TQWidget *parent, TQMessageBox::Icon type, const TQString &t KPushButton *button = new KPushButton( KStdGuiItem::ok(), this ); button->setDefault( true ); button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); - connect( button, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); + connect( button, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 ); - grid->addWidget( label1, 0, 0, Qt::AlignCenter ); - grid->addWidget( label2, 0, 1, Qt::AlignCenter ); - grid->addMultiCellWidget( button, 1,1, 0,1, Qt::AlignCenter ); + grid->addWidget( label1, 0, 0, TQt::AlignCenter ); + grid->addWidget( label2, 0, 1, TQt::AlignCenter ); + grid->addMultiCellWidget( button, 1,1, 0,1, TQt::AlignCenter ); } diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp index a48dcf93a..6e144600f 100644 --- a/tdm/kfrontend/kgapp.cpp +++ b/tdm/kfrontend/kgapp.cpp @@ -101,7 +101,7 @@ GreeterApp::GreeterApp(Display *dpy) : TDEApplication(dpy) init(); } -GreeterApp::GreeterApp(Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap) : TDEApplication(dpy, visual, colormap) +GreeterApp::GreeterApp(Display *dpy, TQt::HANDLE visual, TQt::HANDLE colormap) : TDEApplication(dpy, visual, colormap) { init(); } @@ -124,14 +124,14 @@ void GreeterApp::init() startTimer( pingInterval * 60000 ); } -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(deviceChanged(TDEGenericDevice*))); #endif } void GreeterApp::deviceChanged(TDEGenericDevice* device) { -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #ifdef WITH_XRANDR if (device->type() == TDEGenericDeviceType::Monitor) { KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI(); @@ -139,7 +139,7 @@ void GreeterApp::deviceChanged(TDEGenericDevice* device) { delete randrsimple; } #endif // WITH_XRANDR -#endif // __TDE_HAVE_TDEHWLIB +#endif // WITH_TDEHWLIB } void @@ -201,7 +201,7 @@ checkSAK(GreeterApp* app) app->restoreOverrideCursor(); SAKDlg sak(0); sak.exec(); - app->setOverrideCursor( Qt::WaitCursor ); + app->setOverrideCursor( TQt::WaitCursor ); } void @@ -284,7 +284,7 @@ kg_main( const char *argv0 ) GreeterApp *app; if ((!_compositor.isEmpty()) && ( argb_visual_available == true )) { - app = new GreeterApp(dpyi, Qt::HANDLE( visual ), Qt::HANDLE( colormap )); + app = new GreeterApp(dpyi, TQt::HANDLE( visual ), TQt::HANDLE( colormap )); } else { argb_visual_available = false; @@ -308,11 +308,22 @@ kg_main( const char *argv0 ) iccConfigFile += "/kicc/kiccconfigrc"; KSimpleConfig iccconfig(iccConfigFile, true); if (iccconfig.readBoolEntry("EnableICC", false) == true) { - TQString iccCommand = TQString("/usr/bin/xcalib "); - iccCommand += iccconfig.readEntry("ICCFile"); - iccCommand += TQString(" &"); - if (system(iccCommand.ascii()) < 0) { - printf("WARNING: Unable to execute command \"%s\"\n", iccCommand.ascii()); + TQString iccCommand = TDEGlobal::dirs()->findExe("dispwin"); + if (iccCommand.isEmpty()) + { + iccCommand = TDEGlobal::dirs()->findExe("xcalib"); + } + if (iccCommand.isEmpty()) + { + printf("WARNING: Unable to find command to set ICC profile - dispwin or xcalib\n"); + } + else + { + iccCommand += TQString(" %1 &").arg(iccconfig.readEntry("ICCFile")); + if (system(iccCommand.local8Bit()) < 0) + { + printf("WARNING: Unable to execute command \"%s\"\n", iccCommand.local8Bit().data()); + } } } @@ -400,14 +411,14 @@ kg_main( const char *argv0 ) } if (cmd == G_ErrorGreet) { - if (KGVerify::handleFailVerify( TQT_TQWIDGET(tqApp->desktop()->screen( _greeterScreen )) )) + if (KGVerify::handleFailVerify( tqApp->desktop()->screen( _greeterScreen ) )) break; _autoLoginDelay = 0; cmd = G_Greet; } TDEProcess *proc2 = 0; - app->setOverrideCursor( Qt::WaitCursor ); + app->setOverrideCursor( TQt::WaitCursor ); FDialog *dialog = NULL; #ifdef XDMCP if (cmd == G_Choose) { diff --git a/tdm/kfrontend/kgapp.h b/tdm/kfrontend/kgapp.h index c9e2802c1..1acbcf187 100644 --- a/tdm/kfrontend/kgapp.h +++ b/tdm/kfrontend/kgapp.h @@ -27,20 +27,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define KGAPP_H #include <tdeapplication.h> -#ifdef __TDE_HAVE_TDEHWLIB +#ifdef WITH_TDEHWLIB #include <tdehardwaredevices.h> #else #define TDEGenericDevice void #endif class GreeterApp : public TDEApplication { - Q_OBJECT + TQ_OBJECT typedef TDEApplication inherited; public: GreeterApp(); GreeterApp(Display *dpy); - GreeterApp(Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap); + GreeterApp(Display *dpy, TQt::HANDLE visual, TQt::HANDLE colormap); ~GreeterApp(); virtual bool x11EventFilter( XEvent * ); diff --git a/tdm/kfrontend/kgdialog.cpp b/tdm/kfrontend/kgdialog.cpp index 91058a0b8..684c57e6d 100644 --- a/tdm/kfrontend/kgdialog.cpp +++ b/tdm/kfrontend/kgdialog.cpp @@ -60,42 +60,42 @@ KGDialog::completeMenu() if (_isLocal) { dpyMenu = new TQPopupMenu( this ); int id = inserten( i18n("Sw&itch User"), ALT+Key_I, dpyMenu ); - connect( dpyMenu, TQT_SIGNAL(activated( int )), - TQT_SLOT(slotDisplaySelected( int )) ); - connect( dpyMenu, TQT_SIGNAL(aboutToShow()), - TQT_SLOT(slotPopulateDisplays()) ); + connect( dpyMenu, TQ_SIGNAL(activated( int )), + TQ_SLOT(slotDisplaySelected( int )) ); + connect( dpyMenu, TQ_SIGNAL(aboutToShow()), + TQ_SLOT(slotPopulateDisplays()) ); TQAccel *accel = new TQAccel( this ); accel->insertItem( ALT+CTRL+Key_Insert, id ); - connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotActivateMenu( int )) ); + connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotActivateMenu( int )) ); } #endif if (_allowClose) inserten( _isLocal ? i18n("R&estart X Server") : i18n("Clos&e Connection"), - ALT+Key_E, TQT_SLOT(slotExit()) ); + ALT+Key_E, TQ_SLOT(slotExit()) ); #ifdef XDMCP if (_isLocal && _loginMode != _switchIf) { switchCode = _switchCode; - inserten( _switchMsg, _switchAccel, TQT_SLOT(slotSwitch()) ); + inserten( _switchMsg, _switchAccel, TQ_SLOT(slotSwitch()) ); } #endif if (_hasConsole) - inserten( i18n("Co&nsole Login"), ALT+Key_N, TQT_SLOT(slotConsole()) ); + inserten( i18n("Co&nsole Login"), ALT+Key_N, TQ_SLOT(slotConsole()) ); if (_allowShutdown != SHUT_NONE) { ensureMenu(); - optMenu->insertItem(SmallIconSet( "system-log-out" ), i18n("&Shutdown..."), this, TQT_SLOT(slotShutdown(int)), ALT+Key_S ); + optMenu->insertItem(SmallIconSet( "system-log-out" ), i18n("&Shutdown..."), this, TQ_SLOT(slotShutdown(int)), ALT+Key_S ); TQAccel *accel = new TQAccel( this ); accel->insertItem( ALT+CTRL+Key_Delete ); - connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotShutdown( int )) ); + connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotShutdown( int )) ); accel = new TQAccel( this ); accel->insertItem( SHIFT+ALT+CTRL+Key_PageUp, SHUT_REBOOT ); - connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotShutdown( int )) ); + connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotShutdown( int )) ); accel = new TQAccel( this ); accel->insertItem( SHIFT+ALT+CTRL+Key_PageDown, SHUT_HALT ); - connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotShutdown( int )) ); + connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotShutdown( int )) ); } } @@ -125,7 +125,7 @@ KGDialog::inserten( const TQString& txt, int accel, TQPopupMenu *cmnu ) ensureMenu(); int id = optMenu->insertItem( txt, cmnu ); optMenu->setAccel( accel, id ); - optMenu->connectItem( id, this, TQT_SLOT(slotActivateMenu( int )) ); + optMenu->connectItem( id, this, TQ_SLOT(slotActivateMenu( int )) ); optMenu->setItemParameter( id, id ); return id; } @@ -151,7 +151,7 @@ KGDialog::slotSwitch() { #ifdef XDMCP // workaround for Qt bug - TQTimer::singleShot( 0, this, TQT_SLOT(slotReallySwitch()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotReallySwitch()) ); #endif } diff --git a/tdm/kfrontend/kgdialog.h b/tdm/kfrontend/kgdialog.h index a902b6ff0..fe084ca0b 100644 --- a/tdm/kfrontend/kgdialog.h +++ b/tdm/kfrontend/kgdialog.h @@ -41,7 +41,7 @@ class KGVerify; #define ex_choose 3 class KGDialog : public FDialog { - Q_OBJECT + TQ_OBJECT typedef FDialog inherited; public: diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp index 7f45ca197..d0815efbe 100644 --- a/tdm/kfrontend/kgreeter.cpp +++ b/tdm/kfrontend/kgreeter.cpp @@ -22,6 +22,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include "kgreeter.h" #include "kconsole.h" #include "tdmconfig.h" @@ -35,10 +39,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <dmctl.h> +#ifdef WITH_TDEHWLIB #include <ksslcertificate.h> - #include <tdehardwaredevices.h> #include <tdecryptographiccarddevice.h> +#endif #include <tdeapplication.h> #include <tdelocale.h> @@ -99,9 +104,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <X11/Xlib.h> -#ifdef HAVE_KRB5 -#include <libtdeldap.h> -#endif #define FIFO_DIR "/tmp/tdesocket-global/tdm" #define FIFO_FILE "/tmp/tdesocket-global/tdm/tdmctl-%1" @@ -121,8 +123,8 @@ class UserListView : public TDEListView { // FIXME: This must be configurable, so disable // painting of list background for now. // if (themed) { -// setBackgroundMode( Qt::NoBackground ); -// viewport()->setBackgroundMode( Qt::NoBackground ); +// setBackgroundMode( TQt::NoBackground ); +// viewport()->setBackgroundMode( TQt::NoBackground ); // setFrameStyle( TQFrame::NoFrame ); // } } @@ -167,7 +169,7 @@ public: // painting of list background for now. return TDEListView::paintEmptyArea(p, rect ); - const TQPixmap *pm = TQT_TQPIXMAP_CONST(paletteBackgroundPixmap()); + const TQPixmap *pm = paletteBackgroundPixmap(); if (!pm || pm->isNull()) { return; } @@ -205,18 +207,18 @@ KGreeter::KGreeter( bool framed ) if (_userList) { readFacesList(); userView = new UserListView( framed, this ); - connect( userView, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotUserClicked( TQListViewItem * )) ); - connect( userView, TQT_SIGNAL(doubleClicked( TQListViewItem * )), - TQT_SLOT(accept()) ); + connect( userView, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotUserClicked( TQListViewItem * )) ); + connect( userView, TQ_SIGNAL(doubleClicked( TQListViewItem * )), + TQ_SLOT(accept()) ); } if (_userCompletion) { userList = new TQStringList; } sessMenu = new TQPopupMenu( this ); - connect( sessMenu, TQT_SIGNAL(activated( int )), - TQT_SLOT(slotSessionSelected( int )) ); + connect( sessMenu, TQ_SIGNAL(activated( int )), + TQ_SLOT(slotSessionSelected( int )) ); insertSessions(); if (curPlugin < 0) { @@ -228,8 +230,8 @@ KGreeter::KGreeter( bool framed ) mControlPipeHandler = new ControlPipeHandlerObject(); mControlPipeHandler->mKGreeterParent = this; mControlPipeHandler->moveToThread(mControlPipeHandlerThread); - TQObject::connect(mControlPipeHandler, SIGNAL(processCommand(TQString)), this, SLOT(processInputPipeCommand(TQString))); - TQTimer::singleShot(0, mControlPipeHandler, SLOT(run())); + TQObject::connect(mControlPipeHandler, TQ_SIGNAL(processCommand(TQString)), this, TQ_SLOT(processInputPipeCommand(TQString))); + TQTimer::singleShot(0, mControlPipeHandler, TQ_SLOT(run())); mControlPipeHandlerThread->start(); } @@ -249,16 +251,18 @@ KGreeter::~KGreeter() void KGreeter::cryptographicCardWatcherSetup() { cardLoginUser = TQString::null; +#ifdef WITH_TDEHWLIB // Initialize SmartCard readers TDEGenericDevice *hwdevice; TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard); for (hwdevice = cardReaderList.first(); hwdevice; hwdevice = cardReaderList.next()) { TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice); - connect(cdevice, TQT_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*))); - connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*))); cdevice->enableCardMonitoring(true); } +#endif } void KGreeter::done(int r) { @@ -389,7 +393,7 @@ KGreeter::insertUser( const TQImage &default_pix, TQBuffer buf( fc ); buf.open( IO_ReadOnly ); TQImageIO ir; - ir.setIODevice( TQT_TQIODEVICE(&buf) ); + ir.setIODevice( &buf ); if (!ir.read()) { LogInfo( "%s is no valid image\n", fn.data() ); continue; @@ -397,7 +401,7 @@ KGreeter::insertUser( const TQImage &default_pix, p = ir.image(); TQSize ns( 48, 48 ); if (p.size() != ns) { - p = p.convertDepth( 32 ).smoothScale( ns, TQ_ScaleMin ); + p = p.convertDepth( 32 ).smoothScale( ns, TQImage::ScaleMin ); } break; } while (--nd >= 0); @@ -486,7 +490,7 @@ KGreeter::insertUsers(int limit_users) TQSize ns( 48, 48 ); if (default_pix.size() != ns) default_pix = - default_pix.convertDepth( 32 ).smoothScale( ns, TQ_ScaleMin ); + default_pix.convertDepth( 32 ).smoothScale( ns, TQImage::ScaleMin ); } if (_showUsers == SHOW_ALL) { KGreeterUserList noUsers( _noUsers ); @@ -652,7 +656,7 @@ KGreeter::slotUserEntered() if (isVisible()) slotLoadPrevWM(); else - TQTimer::singleShot( 0, this, TQT_SLOT(slotLoadPrevWM()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotLoadPrevWM()) ); } void @@ -861,15 +865,20 @@ KGreeter::verifySetUser( const TQString &user ) } void KGreeter::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) { -#ifdef HAVE_KRB5 - // Make sure card logins are enabled before attempting one - if (!LDAPManager::pkcsLoginEnabled()) { - return; - } -#else +#ifdef WITH_TDEHWLIB +#ifndef HAVE_KRB5 // Don't enable card-based logins if Kerberos integration was disabled return; #endif + // Make sure card logins are enabled before attempting one + KSimpleConfig *systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" )); + systemconfig->setGroup(NULL); + bool enabled = systemconfig->readBoolEntry("EnablePKCS11Login", false); + delete systemconfig; + if (!enabled) + { + return; + } TQString login_name = TQString::null; X509CertificatePtrList certList = cdevice->cardX509Certificates(); @@ -936,9 +945,11 @@ void KGreeter::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) { verify->accept(); } } +#endif } void KGreeter::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) { +#ifdef WITH_TDEHWLIB cardLoginUser = TQString::null; userView->setEnabled(false); verify->lockUserEntry(false); @@ -950,6 +961,7 @@ void KGreeter::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) { verify->cardLoginInProgress = false; verify->cardLoginDevice = NULL; +#endif } KStdGreeter::KStdGreeter() @@ -981,7 +993,7 @@ KStdGreeter::KStdGreeter() "open windows on it or intercept your input.") ); complainLabel->setAlignment( AlignCenter ); complainLabel->setFont( _failFont ); - complainLabel->setPaletteForegroundColor( Qt::red ); + complainLabel->setPaletteForegroundColor( TQt::red ); inner_box->addWidget( complainLabel ); } if (_logoArea == LOGO_NONE) { @@ -1041,7 +1053,7 @@ KStdGreeter::KStdGreeter() goButton = new TQPushButton( i18n("L&ogin"), this ); goButton->setDefault( true ); - connect( goButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); + connect( goButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); menuButton = new TQPushButton( i18n("&Menu"), this ); //helpButton @@ -1100,7 +1112,7 @@ KStdGreeter::KStdGreeter() verify->setInfoMessageDisplay(showInfoMessages); verify->start(); - TQTimer::singleShot(0, this, SLOT(cryptographicCardWatcherSetup())); + TQTimer::singleShot(0, this, TQ_SLOT(cryptographicCardWatcherSetup())); } void @@ -1156,8 +1168,8 @@ KThemedGreeter::KThemedGreeter() return; } - connect( themer, TQT_SIGNAL(activated( const TQString & )), - TQT_SLOT(slotThemeActivated( const TQString & )) ); + connect( themer, TQ_SIGNAL(activated( const TQString & )), + TQ_SLOT(slotThemeActivated( const TQString & )) ); console_rect = themer->findNode( "xconsole" ); // tdm ext userlist_rect = themer->findNode( "userlist" ); @@ -1244,14 +1256,14 @@ KThemedGreeter::KThemedGreeter() system_button = themer->findNode( "system_button" ); TQAccel *accel = new TQAccel( this ); accel->insertItem( ALT+Key_M, 0 ); - connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotActionMenu()) ); + connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotActionMenu()) ); pluginSetup(); verify->setInfoMessageDisplay(showInfoMessages); verify->start(); - TQTimer::singleShot(0, this, SLOT(cryptographicCardWatcherSetup())); + TQTimer::singleShot(0, this, TQ_SLOT(cryptographicCardWatcherSetup())); } bool @@ -1330,9 +1342,11 @@ KThemedGreeter::updateStatus( bool fail, bool caps, int timedleft ) } } +#ifdef WITH_TDEHWLIB if (cardLoginUser != TQString::null) { verify->setPasswordPrompt(i18n("PIN:")); } +#endif } void diff --git a/tdm/kfrontend/kgreeter.h b/tdm/kfrontend/kgreeter.h index f715b3a8c..ed634c6e8 100644 --- a/tdm/kfrontend/kgreeter.h +++ b/tdm/kfrontend/kgreeter.h @@ -69,7 +69,7 @@ struct SessType { // class ControlPipeHandlerObject : public TQObject { - Q_OBJECT + TQ_OBJECT public: ControlPipeHandlerObject(); @@ -93,7 +93,7 @@ class ControlPipeHandlerObject : public TQObject // TDM greeter // class KGreeter : public KGDialog, public KGVerifyHandler { - Q_OBJECT + TQ_OBJECT typedef KGDialog inherited; public: @@ -166,7 +166,7 @@ class KGreeter : public KGDialog, public KGVerifyHandler { }; class KStdGreeter : public KGreeter { - Q_OBJECT + TQ_OBJECT typedef KGreeter inherited; public: @@ -187,7 +187,7 @@ class KStdGreeter : public KGreeter { }; class KThemedGreeter : public KGreeter { - Q_OBJECT + TQ_OBJECT typedef KGreeter inherited; public: diff --git a/tdm/kfrontend/kgverify.cpp b/tdm/kfrontend/kgverify.cpp index 93bcce27a..105ee3aeb 100644 --- a/tdm/kfrontend/kgverify.cpp +++ b/tdm/kfrontend/kgverify.cpp @@ -32,10 +32,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "themer/tdmitem.h" #include "themer/tdmlabel.h" -#include <ksslcertificate.h> +#ifdef WITH_TDEHWLIB +#include <ksslcertificate.h> #include <tdehardwaredevices.h> #include <tdecryptographiccarddevice.h> +#endif #include <tdeapplication.h> #include <tdelocale.h> @@ -98,11 +100,13 @@ KGVerify::KGVerify(KGVerifyHandler *_handler, KdmThemer *_themer, , isClear(true) , inGreeterPlugin(false) , abortRequested(false) +#ifdef WITH_TDEHWLIB , cardLoginInProgress(false) , cardLoginDevice(NULL) +#endif { - connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) ); - connect( kapp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()) ); + connect( &timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) ); + connect( kapp, TQ_SIGNAL(activity()), TQ_SLOT(slotActivity()) ); _parent->installEventFilter( this ); } @@ -121,8 +125,8 @@ KGVerify::getPlugMenu() uint np = pluginList.count(); if (np > 1) { plugMenu = new TQPopupMenu( parent ); - connect( plugMenu, TQT_SIGNAL(activated( int )), - TQT_SLOT(slotPluginSelected( int )) ); + connect( plugMenu, TQ_SIGNAL(activated( int )), + TQ_SLOT(slotPluginSelected( int )) ); for (uint i = 0; i < np; i++) plugMenu->insertItem( i18n(greetPlugins[pluginList[i]].info->name), pluginList[i] ); } @@ -324,7 +328,11 @@ KGVerify::start() _autoLoginDelay = 0, timeable = false; return; } - else if (!cardLoginInProgress) { + else +#ifdef WITH_TDEHWLIB + if (!cardLoginInProgress) +#endif + { applyPreset(); } } @@ -664,6 +672,7 @@ KGVerify::handleVerify() greet->textPrompt(msg, echo, ndelay); inGreeterPlugin = !ndelay; +#ifdef WITH_TDEHWLIB if (cardLoginInProgress) { TQString autoPIN = cardLoginDevice->autoPIN(); if (autoPIN != TQString::null) { @@ -673,6 +682,7 @@ KGVerify::handleVerify() } cardLoginInProgress = false; } +#endif } else { inGreeterPlugin = true; @@ -1076,7 +1086,7 @@ KGStdVerify::KGStdVerify( KGVerifyHandler *_handler, TQWidget *_parent, failedLabel = new TQLabel( parent ); failedLabel->setFont( _failFont ); - grid->addWidget( failedLabel, 1, 0, Qt::AlignCenter ); + grid->addWidget( failedLabel, 1, 0, TQt::AlignCenter ); updateLockStatus(); } @@ -1133,7 +1143,7 @@ KGStdVerify::updateStatus() if (failedLabelState != nfls) { failedLabelState = nfls; if (nfls < 0) { - failedLabel->setPaletteForegroundColor( Qt::black ); + failedLabel->setPaletteForegroundColor( TQt::black ); failedLabel->setText( i18n( "Automatic login in 1 second...", "Automatic login in %n seconds...", timedLeft ) ); @@ -1143,11 +1153,11 @@ KGStdVerify::updateStatus() failedLabel->clear(); break; case 3: - failedLabel->setPaletteForegroundColor( Qt::red ); + failedLabel->setPaletteForegroundColor( TQt::red ); failedLabel->setText( i18n("Warning: Caps Lock on") ); break; case 2: - failedLabel->setPaletteForegroundColor( Qt::black ); + failedLabel->setPaletteForegroundColor( TQt::black ); failedLabel->setText( authTok ? i18n("Change failed") : fixedEntity.isEmpty() ? @@ -1254,10 +1264,10 @@ KGChTok::KGChTok( TQWidget *_parent, const TQString &user, hlay->addWidget( cancelButton ); hlay->addStretch( 1 ); - connect( okButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( okButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( cancelButton, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); - TQTimer::singleShot( 0, verify, TQT_SLOT(start()) ); + TQTimer::singleShot( 0, verify, TQ_SLOT(start()) ); } KGChTok::~KGChTok() @@ -1311,7 +1321,7 @@ QXTimer::QXTimer() : inherited( 0 ) , left( -1 ) { - connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) ); + connect( &timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) ); } void diff --git a/tdm/kfrontend/kgverify.h b/tdm/kfrontend/kgverify.h index 9935459be..405fa35ba 100644 --- a/tdm/kfrontend/kgverify.h +++ b/tdm/kfrontend/kgverify.h @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // helper class, nuke when qt supports suspend()/resume() class QXTimer : public TQObject { - Q_OBJECT + TQ_OBJECT typedef TQObject inherited; public: @@ -77,7 +77,9 @@ class TQPopupMenu; class TQTimer; class KPushButton; class KLibrary; +#ifdef WITH_TDEHWLIB class TDECryptographicCardDevice; +#endif struct GreeterPluginHandle { KLibrary *library; @@ -87,7 +89,7 @@ struct GreeterPluginHandle { typedef TQValueVector<int> PluginList; class KGVerify : public TQObject, public KGreeterPluginHandler { - Q_OBJECT + TQ_OBJECT typedef TQObject inherited; public: @@ -182,12 +184,14 @@ class KGVerify : public TQObject, public KGreeterPluginHandler { static TQVariant getConf( void *ctx, const char *key, const TQVariant &dflt ); +#ifdef WITH_TDEHWLIB bool cardLoginInProgress; TDECryptographicCardDevice* cardLoginDevice; +#endif }; class KGStdVerify : public KGVerify { - Q_OBJECT + TQ_OBJECT typedef KGVerify inherited; public: @@ -196,7 +200,7 @@ class KGStdVerify : public KGVerify { const PluginList &pluginList, KGreeterPlugin::Function func, KGreeterPlugin::Context ctx ); virtual ~KGStdVerify(); - TQLayout *getLayout() const { return TQT_TQLAYOUT(grid); } + TQLayout *getLayout() const { return grid; } void selectPlugin( int id ); protected: @@ -212,7 +216,7 @@ class KGStdVerify : public KGVerify { }; class KGThemedVerify : public KGVerify { - Q_OBJECT + TQ_OBJECT typedef KGVerify inherited; public: @@ -233,7 +237,7 @@ class KGThemedVerify : public KGVerify { }; class KGChTok : public FDialog, public KGVerifyHandler { - Q_OBJECT + TQ_OBJECT typedef FDialog inherited; public: diff --git a/tdm/kfrontend/krootimage.cpp b/tdm/kfrontend/krootimage.cpp index 7145eb18a..a52adabb2 100644 --- a/tdm/kfrontend/krootimage.cpp +++ b/tdm/kfrontend/krootimage.cpp @@ -51,8 +51,8 @@ MyApplication::MyApplication( const char *conf ) : TDEApplication(), renderer( 0, new KSimpleConfig( TQFile::decodeName( conf ) ) ) { - connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) ); - connect( &renderer, TQT_SIGNAL(imageDone( int )), this, TQT_SLOT(renderDone()) ); + connect( &timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) ); + connect( &renderer, TQ_SIGNAL(imageDone( int )), this, TQ_SLOT(renderDone()) ); renderer.enableTiling( true ); // optimize renderer.changeWallpaper(); // cannot do it when we're killed, so do it now timer.start( 60000 ); @@ -72,8 +72,8 @@ MyApplication::renderDone() TQPixmap pm = renderer.pixmap(); // ...set it to the desktop widget... - TQT_TQWIDGET(desktop())->setBackgroundPixmap( pm ); - TQT_TQWIDGET(desktop())->repaint( true ); + desktop()->setBackgroundPixmap( pm ); + desktop()->repaint( true ); // ...and export it via Esetroot-style so that composition managers can use it! Pixmap bgPm = pm.handle(); // fetch the actual X handle to it diff --git a/tdm/kfrontend/krootimage.h b/tdm/kfrontend/krootimage.h index e002ce230..65b55ba45 100644 --- a/tdm/kfrontend/krootimage.h +++ b/tdm/kfrontend/krootimage.h @@ -32,7 +32,7 @@ Boston, MA 02110-1301, USA. class MyApplication : public TDEApplication { - Q_OBJECT + TQ_OBJECT public: MyApplication( const char * ); diff --git a/tdm/kfrontend/sakdlg.cc b/tdm/kfrontend/sakdlg.cpp index 3758a4719..879e30e02 100644 --- a/tdm/kfrontend/sakdlg.cc +++ b/tdm/kfrontend/sakdlg.cpp @@ -10,10 +10,11 @@ #include <dmctl.h> +#ifdef WITH_TDEHWLIB #include <ksslcertificate.h> - #include <tdehardwaredevices.h> #include <tdecryptographiccarddevice.h> +#endif #include <tdeapplication.h> #include <tdelocale.h> @@ -132,26 +133,28 @@ SAKDlg::SAKDlg(TQWidget *parent) mSAKProcess = new TDEProcess; *mSAKProcess << "tdmtsak" << "dm"; - connect(mSAKProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSAKProcessExited())); + connect(mSAKProcess, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotSAKProcessExited())); mSAKProcess->start(); +#ifdef WITH_TDEHWLIB // Initialize SmartCard readers TDEGenericDevice *hwdevice; TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard); for (hwdevice = cardReaderList.first(); hwdevice; hwdevice = cardReaderList.next()) { TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice); - connect(cdevice, TQT_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*))); - connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*))); cdevice->enableCardMonitoring(true); } +#endif mControlPipeHandlerThread = new TQEventLoopThread(); mControlPipeHandler = new ControlPipeHandlerObject(); mControlPipeHandler->mSAKDlgParent = this; mControlPipeHandler->moveToThread(mControlPipeHandlerThread); - TQObject::connect(mControlPipeHandler, SIGNAL(processCommand(TQString)), this, SLOT(processInputPipeCommand(TQString))); - TQTimer::singleShot(0, mControlPipeHandler, SLOT(run())); + TQObject::connect(mControlPipeHandler, TQ_SIGNAL(processCommand(TQString)), this, TQ_SLOT(processInputPipeCommand(TQString))); + TQTimer::singleShot(0, mControlPipeHandler, TQ_SLOT(run())); mControlPipeHandlerThread->start(); } @@ -172,6 +175,7 @@ void SAKDlg::processInputPipeCommand(TQString command) { } void SAKDlg::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) { +#ifdef WITH_TDEHWLIB TQString login_name = TQString::null; X509CertificatePtrList certList = cdevice->cardX509Certificates(); if (certList.count() > 0) { @@ -213,10 +217,13 @@ void SAKDlg::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) { closeDialogForced(); } } +#endif } void SAKDlg::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) { +#ifdef WITH_TDEHWLIB // +#endif } SAKDlg::~SAKDlg() @@ -246,7 +253,7 @@ void SAKDlg::reject() void SAKDlg::updateLabel(TQString &txt) { - mStatusLabel->setPaletteForegroundColor(Qt::black); + mStatusLabel->setPaletteForegroundColor(TQt::black); mStatusLabel->setText("<b>" + txt + "</b>"); } diff --git a/tdm/kfrontend/sakdlg.h b/tdm/kfrontend/sakdlg.h index fd77dd028..8854d8ee0 100644 --- a/tdm/kfrontend/sakdlg.h +++ b/tdm/kfrontend/sakdlg.h @@ -31,7 +31,7 @@ class TDECryptographicCardDevice; // class SAKDlg : public TQDialog { - Q_OBJECT + TQ_OBJECT public: SAKDlg(TQWidget *parent); diff --git a/tdm/kfrontend/tdmadmindialog.cpp b/tdm/kfrontend/tdmadmindialog.cpp index 7c792c083..9f511d221 100644 --- a/tdm/kfrontend/tdmadmindialog.cpp +++ b/tdm/kfrontend/tdmadmindialog.cpp @@ -70,7 +70,7 @@ TDMAdmin::TDMAdmin( const TQString &user, TQWidget *_parent ) box->addLayout( verify->getLayout() ); TQAccel *accel = new TQAccel( this ); accel->insertItem( ALT+Key_A, 0 ); - connect( accel, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivatePlugMenu()) ); + connect( accel, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivatePlugMenu()) ); box->addWidget( new KSeparator( KSeparator::HLine, this ) ); @@ -87,8 +87,8 @@ TDMAdmin::TDMAdmin( const TQString &user, TQWidget *_parent ) hlay->addWidget( cancelButton ); hlay->addStretch( 1 ); - connect( okButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( okButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( cancelButton, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); slotWhenChanged(); } diff --git a/tdm/kfrontend/tdmadmindialog.h b/tdm/kfrontend/tdmadmindialog.h index e5a68fbb9..bf0e22dce 100644 --- a/tdm/kfrontend/tdmadmindialog.h +++ b/tdm/kfrontend/tdmadmindialog.h @@ -37,7 +37,7 @@ class TQButtonGroup; class TQComboBox; class TDMAdmin : public FDialog, public KGVerifyHandler { - Q_OBJECT + TQ_OBJECT typedef FDialog inherited; public: diff --git a/tdm/kfrontend/tdmclock.cpp b/tdm/kfrontend/tdmclock.cpp index f9a7122b8..88beae860 100644 --- a/tdm/kfrontend/tdmclock.cpp +++ b/tdm/kfrontend/tdmclock.cpp @@ -37,7 +37,7 @@ KdmClock::KdmClock( TQWidget *parent, const char *name ) { // start timer TQTimer *timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()) ); timer->start( 1000 ); // reading rc file diff --git a/tdm/kfrontend/tdmclock.h b/tdm/kfrontend/tdmclock.h index 89a48eb8e..c579cb81c 100644 --- a/tdm/kfrontend/tdmclock.h +++ b/tdm/kfrontend/tdmclock.h @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <tqframe.h> class KdmClock : public TQFrame { - Q_OBJECT + TQ_OBJECT typedef TQFrame inherited; public: diff --git a/tdm/kfrontend/tdmshutdown.cpp b/tdm/kfrontend/tdmshutdown.cpp index 0cba5e82d..da0863be5 100644 --- a/tdm/kfrontend/tdmshutdown.cpp +++ b/tdm/kfrontend/tdmshutdown.cpp @@ -108,7 +108,7 @@ TDMShutdownBase::complete( TQWidget *prevWidget ) box->addLayout( verify->getLayout() ); TQAccel *accel = new TQAccel( this ); accel->insertItem( ALT+Key_A, 0 ); - connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotActivatePlugMenu()) ); + connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotActivatePlugMenu()) ); } box->addWidget( new KSeparator( KSeparator::HLine, this ) ); @@ -121,7 +121,7 @@ TDMShutdownBase::complete( TQWidget *prevWidget ) okButton->setDefault( true ); hlay->addWidget( okButton ); hlay->addStretch( 1 ); - connect( okButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); + connect( okButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); } if (maySched) { KPushButton *schedButton = @@ -129,7 +129,7 @@ TDMShutdownBase::complete( TQWidget *prevWidget ) schedButton->setSizePolicy( fp ); hlay->addWidget( schedButton ); hlay->addStretch( 1 ); - connect( schedButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSched()) ); + connect( schedButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotSched()) ); } cancelButton = new KPushButton( KStdGuiItem::cancel(), this ); cancelButton->setSizePolicy( fp ); @@ -137,7 +137,7 @@ TDMShutdownBase::complete( TQWidget *prevWidget ) cancelButton->setDefault( true ); hlay->addWidget( cancelButton ); hlay->addStretch( 1 ); - connect( cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( cancelButton, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); updateNeedRoot(); } @@ -260,8 +260,8 @@ TDMShutdown::TDMShutdown( int _uid, TQWidget *_parent ) restart_rb = new TDMRadioButton( i18n("&Restart computer"), howGroup ); - connect( rb, TQT_SIGNAL(doubleClicked()), TQT_SLOT(accept()) ); - connect( restart_rb, TQT_SIGNAL(doubleClicked()), TQT_SLOT(accept()) ); + connect( rb, TQ_SIGNAL(doubleClicked()), TQ_SLOT(accept()) ); + connect( restart_rb, TQ_SIGNAL(doubleClicked()), TQ_SLOT(accept()) ); GSet( 1 ); GSendInt( G_ListBootOpts ); @@ -280,7 +280,7 @@ TDMShutdown::TDMShutdown( int _uid, TQWidget *_parent ) + howGroup->insideSpacing(); hb->addSpacing( spc ); hb->addWidget( targets ); - connect( targets, TQT_SIGNAL(activated( int )), TQT_SLOT(slotTargetChanged()) ); + connect( targets, TQ_SIGNAL(activated( int )), TQ_SLOT(slotTargetChanged()) ); } GSet( 0 ); @@ -297,16 +297,16 @@ TDMShutdown::TDMShutdown( int _uid, TQWidget *_parent ) cb_force = new TQCheckBox( i18n("&Force after timeout"), schedGroup ); if (_allowNuke != SHUT_NONE) { - connect( cb_force, TQT_SIGNAL(clicked()), TQT_SLOT(slotWhenChanged()) ); + connect( cb_force, TQ_SIGNAL(clicked()), TQ_SLOT(slotWhenChanged()) ); mayNuke = true; } else cb_force->setEnabled( false ); TQGridLayout *grid = new TQGridLayout( schedGroup, 0, 0, KDmh, KDsh ); grid->addRowSpacing( 0, schedGroup->fontMetrics().height() - 5 ); - grid->addWidget( lab1, 1, 0, Qt::AlignRight ); + grid->addWidget( lab1, 1, 0, TQt::AlignRight ); grid->addWidget( le_start, 1, 1 ); - grid->addWidget( lab2, 2, 0, Qt::AlignRight ); + grid->addWidget( lab2, 2, 0, TQt::AlignRight ); grid->addWidget( le_timeout, 2, 1 ); grid->addMultiCellWidget( cb_force, 3,3, 0,1 ); @@ -437,9 +437,9 @@ TDMDelayedPushButton::TDMDelayedPushButton( const KGuiItem &item, : inherited( item, parent, name ) , pop( 0 ) { - connect( this, TQT_SIGNAL(pressed()), TQT_SLOT(slotPressed()) ); - connect( this, TQT_SIGNAL(released()), TQT_SLOT(slotReleased()) ); - connect( &popt, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) ); + connect( this, TQ_SIGNAL(pressed()), TQ_SLOT(slotPressed()) ); + connect( this, TQ_SIGNAL(released()), TQ_SLOT(slotReleased()) ); + connect( &popt, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) ); } void TDMDelayedPushButton::setPopup( TQPopupMenu *p ) @@ -494,7 +494,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) // first line of buttons hbuttonbox = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() ); - hbuttonbox->setAlignment( Qt::AlignHCenter ); + hbuttonbox->setAlignment( TQt::AlignHCenter ); // Reboot FlatButton* btnReboot = new FlatButton( lfrm ); @@ -503,7 +503,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) int i = btnReboot->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 btnReboot->setAccel( "ALT+" + btnReboot->textLabel().lower()[i+1] ) ; hbuttonbox->addWidget ( btnReboot); - connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot())); + connect(btnReboot, TQ_SIGNAL(clicked()), TQ_SLOT(slotReboot())); // Copied completely from the standard restart/shutdown dialog GSet( 1 ); @@ -522,7 +522,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) t, i ); } btnReboot->setPopup( targets ); - connect( targets, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReboot(int)) ); + connect( targets, TQ_SIGNAL(activated(int)), TQ_SLOT(slotReboot(int)) ); } GSet( 0 ); // Copied completely from the standard restart/shutdown dialog @@ -534,16 +534,16 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) i = btnHalt->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 btnHalt->setAccel( "ALT+" + btnHalt->textLabel().lower()[i+1] ) ; hbuttonbox->addWidget ( btnHalt ); - connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt())); + connect(btnHalt, TQ_SIGNAL(clicked()), TQ_SLOT(slotHalt())); // cancel buttonbox TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() ); - hbuttonbox2->setAlignment( Qt::AlignRight ); + hbuttonbox2->setAlignment( TQt::AlignRight ); // Back to tdm KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), lfrm ); hbuttonbox2->addWidget( btnBack ); - connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect(btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); } else { @@ -567,14 +567,14 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) KPushButton *btnHalt = new KPushButton( KGuiItem( i18n("&Turn Off Computer"), "system-log-out" ), this ); buttonlay->addWidget( btnHalt ); - connect( btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()) ); + connect( btnHalt, TQ_SIGNAL(clicked()), TQ_SLOT(slotHalt()) ); buttonlay->addSpacing( KDialog::spacingHint() ); TDMDelayedPushButton *btnReboot = new TDMDelayedPushButton( KGuiItem( i18n("&Restart Computer"), "reload" ), this ); buttonlay->addWidget( btnReboot ); - connect( btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()) ); + connect( btnReboot, TQ_SIGNAL(clicked()), TQ_SLOT(slotReboot()) ); GSet( 1 ); GSendInt( G_ListBootOpts ); @@ -591,7 +591,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) t, i ); } btnReboot->setPopup( targets ); - connect( targets, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReboot(int)) ); + connect( targets, TQ_SIGNAL(activated(int)), TQ_SLOT(slotReboot(int)) ); } GSet( 0 ); @@ -601,7 +601,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) KPushButton *btnSched = new KPushButton( KGuiItem( i18n("&Schedule...") ), this ); buttonlay->addWidget( btnSched ); - connect( btnSched, TQT_SIGNAL(clicked()), TQT_SLOT(slotSched()) ); + connect( btnSched, TQ_SIGNAL(clicked()), TQ_SLOT(slotSched()) ); buttonlay->addStretch( 1 ); } @@ -612,7 +612,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) KPushButton *btnBack = new KPushButton( KStdGuiItem::cancel(), this ); buttonlay->addWidget( btnBack ); - connect( btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); buttonlay->addSpacing( KDialog::spacingHint() ); } @@ -753,7 +753,7 @@ void FlatButton::init() setUsesBigPixmap(true); setAutoRaise(true); setTextPosition( TQToolButton::Under ); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); } @@ -885,13 +885,13 @@ TDMCancelShutdown::TDMCancelShutdown( int how, int start, int timeout, strt = i18n("now"); else { qdt.setTime_t( start ); - strt = qdt.toString( Qt::LocalDate ); + strt = qdt.toString( TQt::LocalDate ); } if (timeout == TO_INF) end = i18n("infinite"); else { qdt.setTime_t( timeout ); - end = qdt.toString( Qt::LocalDate ); + end = qdt.toString( TQt::LocalDate ); } TQString trg = i18n("Owner: %1" diff --git a/tdm/kfrontend/tdmshutdown.h b/tdm/kfrontend/tdmshutdown.h index 6a2ee3a70..603511267 100644 --- a/tdm/kfrontend/tdmshutdown.h +++ b/tdm/kfrontend/tdmshutdown.h @@ -46,7 +46,7 @@ class TQLineEdit; enum { Authed = TQDialog::Accepted + 1, Schedule }; class TDMShutdownBase : public FDialog, public KGVerifyHandler { - Q_OBJECT + TQ_OBJECT typedef FDialog inherited; public: @@ -94,7 +94,7 @@ class TDMShutdownBase : public FDialog, public KGVerifyHandler { class TDMShutdown : public TDMShutdownBase { - Q_OBJECT + TQ_OBJECT typedef TDMShutdownBase inherited; public: @@ -124,7 +124,7 @@ class TDMShutdown : public TDMShutdownBase { }; class TDMRadioButton : public TQRadioButton { - Q_OBJECT + TQ_OBJECT typedef TQRadioButton inherited; public: @@ -139,7 +139,7 @@ class TDMRadioButton : public TQRadioButton { }; class TDMDelayedPushButton : public KPushButton { - Q_OBJECT + TQ_OBJECT typedef KPushButton inherited; public: @@ -157,7 +157,7 @@ class TDMDelayedPushButton : public KPushButton { }; class TDMSlimShutdown : public FDialog { - Q_OBJECT + TQ_OBJECT typedef FDialog inherited; public: @@ -178,7 +178,7 @@ class TDMSlimShutdown : public FDialog { }; class TDMConfShutdown : public TDMShutdownBase { - Q_OBJECT + TQ_OBJECT typedef TDMShutdownBase inherited; public: @@ -187,7 +187,7 @@ class TDMConfShutdown : public TDMShutdownBase { }; class TDMCancelShutdown : public TDMShutdownBase { - Q_OBJECT + TQ_OBJECT typedef TDMShutdownBase inherited; public: @@ -197,7 +197,7 @@ class TDMCancelShutdown : public TDMShutdownBase { class KSMPushButton : public KPushButton { - Q_OBJECT + TQ_OBJECT public: @@ -215,7 +215,7 @@ private: class FlatButton : public TQToolButton { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdm/kfrontend/themer/tdmitem.cpp b/tdm/kfrontend/themer/tdmitem.cpp index ce5904a26..befcb7c35 100644 --- a/tdm/kfrontend/themer/tdmitem.cpp +++ b/tdm/kfrontend/themer/tdmitem.cpp @@ -232,13 +232,13 @@ KdmItem::setWidget( TQWidget *widget ) myWidget->show(); // Remove borders so that it blends nicely with the theme background - TQFrame* frame = ::tqqt_cast<TQFrame *>( widget ); + TQFrame* frame = ::tqt_cast<TQFrame *>( widget ); if (frame) frame->setFrameStyle( TQFrame::NoFrame ); setGeometry(area, true); - connect( myWidget, TQT_SIGNAL(destroyed()), TQT_SLOT(widgetGone()) ); + connect( myWidget, TQ_SIGNAL(destroyed()), TQ_SLOT(widgetGone()) ); } void @@ -253,11 +253,11 @@ KdmItem::setLayoutItem( TQLayoutItem *item ) myLayoutItem = item; // XXX hiding not supported - it think it's pointless here if (myLayoutItem->widget()) - connect( myLayoutItem->widget(), TQT_SIGNAL(destroyed()), - TQT_SLOT(layoutItemGone()) ); + connect( myLayoutItem->widget(), TQ_SIGNAL(destroyed()), + TQ_SLOT(layoutItemGone()) ); else if (myLayoutItem->layout()) - connect( myLayoutItem->layout(), TQT_SIGNAL(destroyed()), - TQT_SLOT(layoutItemGone()) ); + connect( myLayoutItem->layout(), TQ_SIGNAL(destroyed()), + TQ_SLOT(layoutItemGone()) ); } void @@ -307,7 +307,7 @@ KdmItem::paint( TQPainter *p, const TQRect &rect ) } if (myWidget || (myLayoutItem && myLayoutItem->widget())) { - // TDEListView because it's missing a Q_OBJECT + // TDEListView because it's missing a TQ_OBJECT // FIXME: This is a nice idea in theory, but in practice it is // very confusing for the user not to see the empty list box // delineated from the rest of the greeter. @@ -379,7 +379,7 @@ KdmItem::paint( TQPainter *p, const TQRect &rect ) #ifdef DRAW_OUTLINE // Draw bounding rect for this item - p->setPen( Qt::white ); + p->setPen( TQt::white ); p->drawRect( area ); #endif @@ -583,8 +583,8 @@ KdmItem::addChildItem( KdmItem *item ) } // signal bounce from child to parent - connect( item, TQT_SIGNAL(needUpdate( int, int, int, int )), TQT_SIGNAL(needUpdate( int, int, int, int )) ); - connect( item, TQT_SIGNAL(activated( const TQString & )), TQT_SIGNAL(activated( const TQString & )) ); + connect( item, TQ_SIGNAL(needUpdate( int, int, int, int )), TQ_SIGNAL(needUpdate( int, int, int, int )) ); + connect( item, TQ_SIGNAL(activated( const TQString & )), TQ_SIGNAL(activated( const TQString & )) ); } void @@ -663,7 +663,7 @@ KdmItem::parentWidget() const if (!this->parent()) return 0; - if (parent()->tqt_cast(TQWIDGET_OBJECT_NAME_STRING)) + if (parent()->tqt_cast("TQWidget")) return (TQWidget*)parent(); return ((KdmItem*)parent())->parentWidget(); } diff --git a/tdm/kfrontend/themer/tdmitem.h b/tdm/kfrontend/themer/tdmitem.h index d2aeed69c..ad07f16cb 100644 --- a/tdm/kfrontend/themer/tdmitem.h +++ b/tdm/kfrontend/themer/tdmitem.h @@ -81,7 +81,7 @@ class TQLayoutItem; */ class KdmItem : public TQObject { - Q_OBJECT + TQ_OBJECT friend class KdmThemer; diff --git a/tdm/kfrontend/themer/tdmlabel.cpp b/tdm/kfrontend/themer/tdmlabel.cpp index f2fae90a6..1af382819 100644 --- a/tdm/kfrontend/themer/tdmlabel.cpp +++ b/tdm/kfrontend/themer/tdmlabel.cpp @@ -100,7 +100,7 @@ KdmLabel::KdmLabel( KdmItem *parent, const TQDomNode &node, const char *name ) if (label.isTimer) { timer = new TQTimer( this ); timer->start( 1000 ); - connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(update()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(update()) ); } setTextInt( lookupText( label.text ) ); } @@ -117,7 +117,7 @@ KdmLabel::setTextInt( const TQString &txt) cText.remove('&'); myAccel = new TQAccel(parentWidget()); myAccel->insertItem(ALT + UNICODE_ACCEL + cText.at(cAccel).lower().unicode()); - connect(myAccel, TQT_SIGNAL(activated(int)), TQT_SLOT(slotAccel())); + connect(myAccel, TQ_SIGNAL(activated(int)), TQ_SLOT(slotAccel())); } } diff --git a/tdm/kfrontend/themer/tdmlabel.h b/tdm/kfrontend/themer/tdmlabel.h index e45d68091..37b10be56 100644 --- a/tdm/kfrontend/themer/tdmlabel.h +++ b/tdm/kfrontend/themer/tdmlabel.h @@ -34,7 +34,7 @@ class TQTimer; */ class KdmLabel : public KdmItem { - Q_OBJECT + TQ_OBJECT public: KdmLabel( KdmItem *parent, const TQDomNode &node, const char *name = 0 ); diff --git a/tdm/kfrontend/themer/tdmpixmap.cpp b/tdm/kfrontend/themer/tdmpixmap.cpp index 079135c1d..fa9e0fcf5 100644 --- a/tdm/kfrontend/themer/tdmpixmap.cpp +++ b/tdm/kfrontend/themer/tdmpixmap.cpp @@ -303,9 +303,9 @@ KdmPixmap::drawContents( TQPainter *p, const TQRect &r ) float tint_alpha = pClass->alpha; for (int y = 0; y < h; ++y) { - QRgb *ls = (QRgb *)scaledImage.scanLine( y ); + TQRgb *ls = (TQRgb *)scaledImage.scanLine( y ); for (int x = 0; x < w; ++x) { - QRgb l = ls[x]; + TQRgb l = ls[x]; int r = int( tqRed( l ) * tint_red ); int g = int( tqGreen( l ) * tint_green ); int b = int( tqBlue( l ) * tint_blue ); diff --git a/tdm/kfrontend/themer/tdmpixmap.h b/tdm/kfrontend/themer/tdmpixmap.h index faa71a034..90d0a38aa 100644 --- a/tdm/kfrontend/themer/tdmpixmap.h +++ b/tdm/kfrontend/themer/tdmpixmap.h @@ -35,7 +35,7 @@ */ class KdmPixmap : public KdmItem { - Q_OBJECT + TQ_OBJECT public: KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name = 0 ); diff --git a/tdm/kfrontend/themer/tdmrect.cpp b/tdm/kfrontend/themer/tdmrect.cpp index a92b0f679..bb4023cd4 100644 --- a/tdm/kfrontend/themer/tdmrect.cpp +++ b/tdm/kfrontend/themer/tdmrect.cpp @@ -182,7 +182,7 @@ KdmRect::setWidget( TQWidget *widget ) if ( rect.normal.color.isValid() && widget ) { TQPalette p = widget->palette(); - p.setColor( TQPalette::Normal, TQColorGroup::Text, rect.normal.color ); + p.setColor( TQPalette::Active, TQColorGroup::Text, rect.normal.color ); widget->setPalette(p); } KdmItem::setWidget( widget ); diff --git a/tdm/kfrontend/themer/tdmrect.h b/tdm/kfrontend/themer/tdmrect.h index 6dfdc126a..8c436ccda 100644 --- a/tdm/kfrontend/themer/tdmrect.h +++ b/tdm/kfrontend/themer/tdmrect.h @@ -32,7 +32,7 @@ */ class KdmRect : public KdmItem { - Q_OBJECT + TQ_OBJECT public: KdmRect( KdmItem *parent, const TQDomNode &node, const char *name = 0 ); diff --git a/tdm/kfrontend/themer/tdmthemer.cpp b/tdm/kfrontend/themer/tdmthemer.cpp index 6c27b7629..f064e384a 100644 --- a/tdm/kfrontend/themer/tdmthemer.cpp +++ b/tdm/kfrontend/themer/tdmthemer.cpp @@ -78,24 +78,24 @@ KdmThemer::KdmThemer( const TQString &_filename, const TQString &mode, TQWidget // Set the root (screen) item rootItem = new KdmRect( parent, TQDomNode(), "tdm root" ); - connect( rootItem, TQT_SIGNAL(needUpdate( int, int, int, int )), - widget(), TQT_SLOT(update( int, int, int, int )) ); + connect( rootItem, TQ_SIGNAL(needUpdate( int, int, int, int )), + widget(), TQ_SLOT(update( int, int, int, int )) ); rootItem->setBaseDir( TQFileInfo( filename ).dirPath( true ) ); // generate all the items defined in the theme generateItems( rootItem ); - connect( rootItem, TQT_SIGNAL(activated( const TQString & )), TQT_SIGNAL(activated( const TQString & )) ); - connect( rootItem, TQT_SIGNAL(activated( const TQString & )), TQT_SLOT(slotActivated( const TQString & )) ); + connect( rootItem, TQ_SIGNAL(activated( const TQString & )), TQ_SIGNAL(activated( const TQString & )) ); + connect( rootItem, TQ_SIGNAL(activated( const TQString & )), TQ_SLOT(slotActivated( const TQString & )) ); - TQTimer::singleShot(800, this, TQT_SLOT(slotPaintRoot())); + TQTimer::singleShot(800, this, TQ_SLOT(slotPaintRoot())); /* *TODO* // Animation timer TQTimer *time = new TQTimer( this ); time->start( 500 ); - connect( time, TQT_SIGNAL(timeout()), TQT_SLOT(update()) ) + connect( time, TQ_SIGNAL(timeout()), TQ_SLOT(update()) ) */ } @@ -139,19 +139,19 @@ KdmThemer::widgetEvent( TQEvent *e ) switch (e->type()) { case TQEvent::MouseMove: { - TQMouseEvent *me = TQT_TQMOUSEEVENT(e); + TQMouseEvent *me = static_cast<TQMouseEvent*>(e); rootItem->mouseEvent( me->x(), me->y() ); } break; case TQEvent::MouseButtonPress: { - TQMouseEvent *me = TQT_TQMOUSEEVENT(e); + TQMouseEvent *me = static_cast<TQMouseEvent*>(e); rootItem->mouseEvent( me->x(), me->y(), true ); } break; case TQEvent::MouseButtonRelease: { - TQMouseEvent *me = TQT_TQMOUSEEVENT(e); + TQMouseEvent *me = static_cast<TQMouseEvent*>(e); rootItem->mouseEvent( me->x(), me->y(), false, true ); } break; @@ -164,7 +164,7 @@ KdmThemer::widgetEvent( TQEvent *e ) break; case TQEvent::Paint: { - TQRect paintRect = TQT_TQPAINTEVENT(e)->rect(); + TQRect paintRect = static_cast<TQPaintEvent*>(e)->rect(); kdDebug() << timestamp() << " paint on: " << paintRect << endl; if (!argb_visual_available) { @@ -411,7 +411,7 @@ KdmThemer::slotActivated( const TQString &id ) } item->widget()->setFocus(); - TQLineEdit *le = (TQLineEdit*)item->widget()->tqt_cast(TQLINEEDIT_OBJECT_NAME_STRING); + TQLineEdit *le = (TQLineEdit*)item->widget()->tqt_cast("TQLineEdit"); if (le) { le->selectAll(); } @@ -432,8 +432,8 @@ KdmThemer::slotPaintRoot() } else return; - TQT_TQWIDGET(TQApplication::desktop()->screen())->setErasePixmap(pm); - TQT_TQWIDGET(TQApplication::desktop()->screen())->erase(); + TQApplication::desktop()->screen()->setErasePixmap(pm); + TQApplication::desktop()->screen()->erase(); } #include "tdmthemer.moc" diff --git a/tdm/kfrontend/themer/tdmthemer.h b/tdm/kfrontend/themer/tdmthemer.h index 785a116da..7b9cd2049 100644 --- a/tdm/kfrontend/themer/tdmthemer.h +++ b/tdm/kfrontend/themer/tdmthemer.h @@ -49,7 +49,7 @@ class TQEvent; class KdmThemer : public TQObject { - Q_OBJECT + TQ_OBJECT public: /* |