diff options
Diffstat (limited to 'tdm')
29 files changed, 160 insertions, 159 deletions
diff --git a/tdm/ConfigureChecks.cmake b/tdm/ConfigureChecks.cmake index 8ebba8e6d..d0080f4f1 100644 --- a/tdm/ConfigureChecks.cmake +++ b/tdm/ConfigureChecks.cmake @@ -18,7 +18,11 @@ check_function_exists( getdomainname HAVE_GETDOMAINNAME ) check_function_exists( initgroups HAVE_INITGROUPS ) check_function_exists( mkstemp HAVE_MKSTEMP ) check_function_exists( setproctitle HAVE_SETPROCTITLE ) +tde_save_and_set( CMAKE_REQUIRED_DEFINITIONS "-D_GNU_SOURCE" "-D__BSD_VISIBLE=1" ) +tde_save_and_set( CMAKE_REQUIRED_LIBRARIES "pthread" ) check_function_exists( pthread_setname_np HAVE_PTHREAD_SETNAME_NP ) +tde_restore( CMAKE_REQUIRED_DEFINITIONS ) +tde_restore( CMAKE_REQUIRED_LIBRARIES ) check_function_exists( sysinfo HAVE_SYSINFO ) check_function_exists( strnlen HAVE_STRNLEN ) check_function_exists( getifaddrs HAVE_GETIFADDRS ) diff --git a/tdm/backend/CMakeLists.txt b/tdm/backend/CMakeLists.txt index f09704486..a9144d5ff 100644 --- a/tdm/backend/CMakeLists.txt +++ b/tdm/backend/CMakeLists.txt @@ -49,6 +49,8 @@ tde_add_executable( tdm process.c protodpy.c reset.c resource.c rpcauth.c server.c session.c sessreg.c socket.c streams.c util.c xdmauth.c xdmcp.c - LINK X11 ${XAU_LIBRARIES} ${DBUS_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${UTIL_LIBRARY} ${XDMCP_LIBRARIES} + LINK + X11 ${CMAKE_THREAD_LIBS_INIT} ${XAU_LIBRARIES} ${DBUS_LIBRARIES} ${CRYPT_LIBRARY} + ${PAM_LIBRARY} ${UTIL_LIBRARY} ${XDMCP_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/tdm/backend/ctrl.c b/tdm/backend/ctrl.c index cc9540745..200b7056b 100644 --- a/tdm/backend/ctrl.c +++ b/tdm/backend/ctrl.c @@ -592,7 +592,7 @@ processCtrl( const char *string, int len, int fd, struct display *d ) } else if (fd >= 0 && !strcmp( ar[0], "activevt" )) { #ifdef HAVE_VTS Reply( "ok" ); - int vt_fd = getfd(NULL); + int vt_fd = getfd(); if (vt_fd > 0) { struct vt_stat vtstat; if (!ioctl(vt_fd, VT_GETSTATE, &vtstat)) { diff --git a/tdm/backend/dm.c b/tdm/backend/dm.c index 627d2c23d..05dfb7a5b 100644 --- a/tdm/backend/dm.c +++ b/tdm/backend/dm.c @@ -36,6 +36,13 @@ from the copyright holder. #include <tqglobal.h> +#include <config.h> +#ifdef HAVE_PTHREAD_SETNAME_NP +#define _GNU_SOURCE +#define __BSD_VISIBLE 1 +#include <pthread.h> +#endif /* pthread_setname_np() */ + #include "dm.h" #include "dm_auth.h" #include "dm_error.h" @@ -53,10 +60,6 @@ from the copyright holder. # include <sys/vt.h> #endif -#ifdef HAVE_PTHREAD_SETNAME_NP -#include <pthread.h> -#endif /* pthread_setname_np() */ - // Limited by the number of VTs configured into the kernel or 256, whichever is less #define MAX_VT_NUMBER 48 diff --git a/tdm/backend/dm.h b/tdm/backend/dm.h index ae731aeca..c3d327a5e 100644 --- a/tdm/backend/dm.h +++ b/tdm/backend/dm.h @@ -61,10 +61,6 @@ from the copyright holder. #include <errno.h> #ifdef XDMCP -# if defined(__osf__) -/* someone somewhere defines QUERY under Tru64 which confuses Xdmcp.h */ -# undef QUERY -# endif # include <X11/Xdmcp.h> #endif diff --git a/tdm/backend/xdmcp.c b/tdm/backend/xdmcp.c index 6abaf5fc8..85bea54be 100644 --- a/tdm/backend/xdmcp.c +++ b/tdm/backend/xdmcp.c @@ -160,7 +160,7 @@ all_query_respond( struct sockaddr *from, int fromlen, int family; int length; - family = ConvertAddr( (XdmcpNetaddr)from, &length, &(addr.data) ); + family = ConvertAddr( (XdmcpNetaddr)from, &length, (char**)&(addr.data) ); addr.length = length; /* convert int to short */ Debug( "all_query_respond: conntype=%d, addr=%02[*:hhx\n", family, addr.length, addr.data ); diff --git a/tdm/cryptocardwatcher/main.cpp b/tdm/cryptocardwatcher/main.cpp index 5d27ff19b..34cc96b59 100644 --- a/tdm/cryptocardwatcher/main.cpp +++ b/tdm/cryptocardwatcher/main.cpp @@ -123,8 +123,8 @@ int main(int argc, char *argv[]) { TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard); for (hwdevice = cardReaderList.first(); hwdevice; hwdevice = cardReaderList.next()) { TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice); - TQObject::connect(cdevice, TQT_SIGNAL(cardInserted(TDECryptographicCardDevice*)), watcher, TQT_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*))); - TQObject::connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), watcher, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*))); + TQObject::connect(cdevice, TQ_SIGNAL(cardInserted(TDECryptographicCardDevice*)), watcher, TQ_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*))); + TQObject::connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), watcher, TQ_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*))); cdevice->enableCardMonitoring(true); } diff --git a/tdm/kfrontend/kchooser.cpp b/tdm/kfrontend/kchooser.cpp index 3076d4a3c..0bc007e23 100644 --- a/tdm/kfrontend/kchooser.cpp +++ b/tdm/kfrontend/kchooser.cpp @@ -72,10 +72,10 @@ ChooserDlg::ChooserDlg() vbox->addWidget( host_view ); iline = new TQLineEdit( this ); - iline->setEnabled( TRUE ); + 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 ); @@ -107,12 +107,12 @@ ChooserDlg::ChooserDlg() #endif sn = new TQSocketNotifier( rfd, TQSocketNotifier::Read, this ); - connect( sn, TQT_SIGNAL(activated( int )), TQT_SLOT(slotReadPipe()) ); + 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/kconsole.cpp b/tdm/kfrontend/kconsole.cpp index bf1560aed..e885b3b5a 100644 --- a/tdm/kfrontend/kconsole.cpp +++ b/tdm/kfrontend/kconsole.cpp @@ -39,12 +39,10 @@ extern "C" { #include <termios.h> } #endif -#if !defined(__osf__) #ifdef HAVE_TERMIO_H /* needed at least on AIX */ #include <termio.h> #endif -#endif #if defined (_HPUX_SOURCE) #define _TERMIOS_INCLUDED @@ -129,7 +127,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/kfdialog.cpp b/tdm/kfrontend/kfdialog.cpp index 428b2ce09..30ee85a00 100644 --- a/tdm/kfrontend/kfdialog.cpp +++ b/tdm/kfrontend/kfdialog.cpp @@ -178,7 +178,7 @@ 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, TQt::AlignCenter ); diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp index c7d694608..731cb33b5 100644 --- a/tdm/kfrontend/kgapp.cpp +++ b/tdm/kfrontend/kgapp.cpp @@ -35,11 +35,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "sakdlg.h" #include <kuser.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdecmdlineargs.h> -#include <kcrash.h> -#include <kstandarddirs.h> -#include <ksimpleconfig.h> +#include <tdecrash.h> +#include <tdestandarddirs.h> +#include <tdesimpleconfig.h> #include <tdelocale.h> #include <kdebug.h> #ifdef WITH_XRANDR @@ -70,9 +70,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. bool argb_visual_available = false; bool has_twin = false; bool is_themed = false; -bool trinity_desktop_lock_use_sak = TRUE; -bool trinity_desktop_synchronize_keyboard_lights = TRUE; -bool trinity_desktop_watch_cryptographic_cards = TRUE; +bool trinity_desktop_lock_use_sak = true; +bool trinity_desktop_synchronize_keyboard_lights = true; +bool trinity_desktop_watch_cryptographic_cards = true; TQPoint primaryScreenPosition; static int @@ -126,7 +126,7 @@ void GreeterApp::init() #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 } @@ -193,8 +193,6 @@ xIOErr( Display * ) exit( EX_RESERVER_DPY ); } -//KSimpleConfig *iccconfig; - void checkSAK(GreeterApp* app) { @@ -306,7 +304,7 @@ kg_main( const char *argv0 ) // Load up the systemwide ICC profile TQString iccConfigFile = TQString(KDE_CONFDIR); iccConfigFile += "/kicc/kiccconfigrc"; - KSimpleConfig iccconfig(iccConfigFile, true); + TDESimpleConfig iccconfig(iccConfigFile, true); if (iccconfig.readBoolEntry("EnableICC", false) == true) { TQString iccCommand = TDEGlobal::dirs()->findExe("dispwin"); if (iccCommand.isEmpty()) @@ -346,7 +344,7 @@ kg_main( const char *argv0 ) _colorScheme = locate( "data", "tdedisplay/color-schemes/" + _colorScheme + ".kcsrc" ); if (!_colorScheme.isEmpty()) { - KSimpleConfig config( _colorScheme, true ); + TDESimpleConfig config( _colorScheme, true ); config.setGroup( "Color Scheme" ); app->setPalette( app->createApplicationPalette( &config, 7 ) ); } 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/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp index 19d27fe2f..a9901b08c 100644 --- a/tdm/kfrontend/kgreeter.cpp +++ b/tdm/kfrontend/kgreeter.cpp @@ -47,10 +47,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <tdeapplication.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kseparator.h> #include <tdelistview.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kstringhandler.h> #include <kdebug.h> #include <kdialog.h> @@ -201,24 +201,24 @@ KGreeter::KGreeter( bool framed ) , showInfoMessages( true ) , closingDown( false ) { - stsFile = new KSimpleConfig( _stsFile ); + stsFile = new TDESimpleConfig( _stsFile ); stsFile->setGroup( "PrevUser" ); 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) { @@ -230,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(); } @@ -258,8 +258,8 @@ void KGreeter::cryptographicCardWatcherSetup() { 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 @@ -615,7 +615,7 @@ KGreeter::insertSessions() TQStringList ents = TQDir( *dit ).entryList(); for (TQStringList::ConstIterator it = ents.begin(); it != ents.end(); ++it) if ((*it).endsWith( ".desktop" ) && !(*it).endsWith("admin.desktop")) { - KSimpleConfig dsk( TQString( *dit ).append( '/' ).append( *it ) ); + TDESimpleConfig dsk( TQString( *dit ).append( '/' ).append( *it ) ); dsk.setGroup( "Desktop Entry" ); putSession( (*it).left( (*it).length() - 8 ), dsk.readEntry( "Name" ), @@ -656,7 +656,7 @@ KGreeter::slotUserEntered() if (isVisible()) slotLoadPrevWM(); else - TQTimer::singleShot( 0, this, TQT_SLOT(slotLoadPrevWM()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotLoadPrevWM()) ); } void @@ -871,7 +871,7 @@ void KGreeter::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) { return; #endif // Make sure card logins are enabled before attempting one - KSimpleConfig *systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" )); + TDESimpleConfig *systemconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/ldap/ldapconfigrc" )); systemconfig->setGroup(NULL); bool enabled = systemconfig->readBoolEntry("EnablePKCS11Login", false); delete systemconfig; @@ -1020,7 +1020,7 @@ KStdGreeter::KStdGreeter() case LOGO_LOGO: { TQMovie movie( _logo ); - kapp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers, 100 ); + tdeApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers, 100 ); TQPixmap pixmap; if (!movie.framePixmap().isNull() || pixmap.load( _logo )) { pixLabel = new TQLabel( this ); @@ -1053,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 @@ -1112,7 +1112,7 @@ KStdGreeter::KStdGreeter() verify->setInfoMessageDisplay(showInfoMessages); verify->start(); - TQTimer::singleShot(0, this, SLOT(cryptographicCardWatcherSetup())); + TQTimer::singleShot(0, this, TQ_SLOT(cryptographicCardWatcherSetup())); } void @@ -1168,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" ); @@ -1256,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 diff --git a/tdm/kfrontend/kgreeter.h b/tdm/kfrontend/kgreeter.h index ed634c6e8..51a4f799e 100644 --- a/tdm/kfrontend/kgreeter.h +++ b/tdm/kfrontend/kgreeter.h @@ -37,7 +37,7 @@ class KdmThemer; class KdmItem; class TDEListView; -class KSimpleConfig; +class TDESimpleConfig; class TQLabel; class TQPushButton; @@ -125,7 +125,7 @@ class KGreeter : public KGDialog, public KGVerifyHandler { virtual void pluginSetup(); void setPrevWM( int ); - KSimpleConfig *stsFile; + TDESimpleConfig *stsFile; UserListView *userView; TQStringList *userList; TQPopupMenu *sessMenu; diff --git a/tdm/kfrontend/kgverify.cpp b/tdm/kfrontend/kgverify.cpp index 66b13e974..7b8e012a9 100644 --- a/tdm/kfrontend/kgverify.cpp +++ b/tdm/kfrontend/kgverify.cpp @@ -105,8 +105,8 @@ KGVerify::KGVerify(KGVerifyHandler *_handler, KdmThemer *_themer, , 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( tdeApp, TQ_SIGNAL(activity()), TQ_SLOT(slotActivity()) ); _parent->installEventFilter( this ); } @@ -125,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] ); } @@ -301,7 +301,7 @@ void KGVerify::setInfoMessageDisplay(bool on) { // assert( fixedEntity.isEmpty() ); - Debug( "%s->setInfoMessageDisplay(%\"s)\n", pName.data(), on ); + Debug( "%s->setInfoMessageDisplay(%\"d)\n", pName.data(), on ); greet->setInfoMessageDisplay(on); } @@ -849,7 +849,7 @@ KGVerify::handleVerify() failed = true; updateStatus(); handler->verifyFailed(); - timer.start( 1500 + kapp->random()/(RAND_MAX/1000) ); + timer.start( 1500 + tdeApp->random()/(RAND_MAX/1000) ); return; } if (ret != V_FAIL) @@ -1264,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() @@ -1321,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/krootimage.cpp b/tdm/kfrontend/krootimage.cpp index 889f41e58..93f8521e1 100644 --- a/tdm/kfrontend/krootimage.cpp +++ b/tdm/kfrontend/krootimage.cpp @@ -22,7 +22,7 @@ Boston, MA 02110-1301, USA. #include <config.h> #include <tdecmdlineargs.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdelocale.h> #include <tqfile.h> @@ -49,10 +49,10 @@ static bool properties_inited = false; MyApplication::MyApplication( const char *conf ) : TDEApplication(), - renderer( 0, new KSimpleConfig( TQFile::decodeName( conf ) ) ) + renderer( 0, new TDESimpleConfig( 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 ); diff --git a/tdm/kfrontend/pics/tdelogo.png b/tdm/kfrontend/pics/tdelogo.png Binary files differindex 647b5c6ea..0bd71f4bb 100644..100755 --- a/tdm/kfrontend/pics/tdelogo.png +++ b/tdm/kfrontend/pics/tdelogo.png diff --git a/tdm/kfrontend/sakdlg.cpp b/tdm/kfrontend/sakdlg.cpp index 138045a52..1d7b952e4 100644 --- a/tdm/kfrontend/sakdlg.cpp +++ b/tdm/kfrontend/sakdlg.cpp @@ -20,7 +20,7 @@ #include <tdelocale.h> #include <kpushbutton.h> #include <kseparator.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobalsettings.h> #include <tdeconfig.h> #include <kiconloader.h> @@ -84,7 +84,7 @@ #define FIFO_FILE "/tmp/tdesocket-global/tdm/tdmctl-%1" #define FIFO_SAK_FILE "/tmp/tdesocket-global/tdm/tdmctl-sak-%1" -bool trinity_desktop_lock_use_system_modal_dialogs = TRUE; +bool trinity_desktop_lock_use_system_modal_dialogs = true; extern bool trinity_desktop_lock_use_sak; //=========================================================================== @@ -133,7 +133,7 @@ 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 @@ -143,8 +143,8 @@ SAKDlg::SAKDlg(TQWidget *parent) 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 @@ -153,8 +153,8 @@ SAKDlg::SAKDlg(TQWidget *parent) 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(); } diff --git a/tdm/kfrontend/sakdlg.h b/tdm/kfrontend/sakdlg.h index 8854d8ee0..5a9d15a4c 100644 --- a/tdm/kfrontend/sakdlg.h +++ b/tdm/kfrontend/sakdlg.h @@ -12,7 +12,7 @@ #include <tqdialog.h> #include <tqstringlist.h> -#include <kprocess.h> +#include <tdeprocess.h> #include "kgreeter.h" diff --git a/tdm/kfrontend/sessions/tde.desktop.cmake b/tdm/kfrontend/sessions/tde.desktop.cmake index a9d5950ff..591a67aa3 100644 --- a/tdm/kfrontend/sessions/tde.desktop.cmake +++ b/tdm/kfrontend/sessions/tde.desktop.cmake @@ -3,6 +3,6 @@ Encoding=UTF-8 Type=XSession Exec=@TDE_BIN_DIR@/starttde TryExec=@TDE_BIN_DIR@/starttde -DesktopNames=Trinity +DesktopNames=TDE Name=TDE Comment=The Trinity Desktop Environment. A powerful Open Source graphical desktop environment diff --git a/tdm/kfrontend/sessions/tde.desktop.in b/tdm/kfrontend/sessions/tde.desktop.in index 81404ed7c..d31df0206 100644 --- a/tdm/kfrontend/sessions/tde.desktop.in +++ b/tdm/kfrontend/sessions/tde.desktop.in @@ -3,6 +3,6 @@ Encoding=UTF-8 Type=XSession Exec=@TDE_BINDIR@/starttde TryExec=@TDE_BINDIR@/starttde -DesktopNames=Trinity +DesktopNames=TDE Name=TDE Comment=The Trinity Desktop Environment. A powerful Open Source graphical desktop environment 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/tdmclock.cpp b/tdm/kfrontend/tdmclock.cpp index f9a7122b8..b3a79295f 100644 --- a/tdm/kfrontend/tdmclock.cpp +++ b/tdm/kfrontend/tdmclock.cpp @@ -37,24 +37,24 @@ 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 - //TDEConfig *config = kapp->config(); + //TDEConfig *config = tdeApp->config(); //config->setGroup( "Option" ); - mDate = false;//config->readNumEntry( "date", FALSE ); - mSecond = true;//config->readNumEntry( "second", TRUE ); - mDigital = false;//config->readNumEntry( "digital", FALSE ); - mBorder = false;//config->readNumEntry( "border", FALSE ); + mDate = false;//config->readNumEntry( "date", false ); + mSecond = true;//config->readNumEntry( "second", true ); + mDigital = false;//config->readNumEntry( "digital", false ); + mBorder = false;//config->readNumEntry( "border", false ); //config->setGroup( "Font" ); mFont.setFamily( TQString::fromLatin1("Utopia")/*config->readEntry( "Family", "Utopia")*/ ); mFont.setPointSize( 51/*config->readNumEntry( "Point Size", 51)*/ ); mFont.setWeight( 75/*config->readNumEntry( "Weight", 75)*/ ); - mFont.setItalic( TRUE/*config->readNumEntry( "Italic",TRUE )*/ ); - mFont.setBold( TRUE/*config->readNumEntry( "Bold",TRUE )*/ ); + mFont.setItalic( true/*config->readNumEntry( "Italic",true )*/ ); + mFont.setBold( true/*config->readNumEntry( "Bold",true )*/ ); setFixedSize( 100, 100 ); diff --git a/tdm/kfrontend/tdmshutdown.cpp b/tdm/kfrontend/tdmshutdown.cpp index 1a9ea254c..84a0153e5 100644 --- a/tdm/kfrontend/tdmshutdown.cpp +++ b/tdm/kfrontend/tdmshutdown.cpp @@ -30,9 +30,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <tdelocale.h> #include <kpushbutton.h> #include <kstdguiitem.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <kdialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kuser.h> #include <tdeconfig.h> #include <kiconloader.h> @@ -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 ); @@ -276,11 +276,11 @@ TDMShutdown::TDMShutdown( int _uid, TQWidget *_parent ) freeStrArr( tlist ); targets->setCurrentItem( oldTarget == -1 ? defaultTarget : oldTarget ); TQHBoxLayout *hb = new TQHBoxLayout( hlp, 0, KDsh ); - int spc = kapp->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ) + int spc = tdeApp->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ) + 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,7 +297,7 @@ 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 ); @@ -327,7 +327,7 @@ TDMShutdown::TDMShutdown( int _uid, TQWidget *_parent ) static int get_date( const char *str ) { - KProcIO prc; + TDEProcIO prc; prc << "/bin/date" << "+%s" << "-d" << str; prc.start( TDEProcess::Block, false ); TQString dstr; @@ -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 ) @@ -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,7 +534,7 @@ 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() ); @@ -543,7 +543,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) // 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() ); } @@ -698,7 +698,7 @@ void KSMPushButton::keyPressEvent( TQKeyEvent* e ) case Key_Enter: case Key_Return: case Key_Space: - m_pressed = TRUE; + m_pressed = true; setDown(true); emit pressed(); break; @@ -723,7 +723,7 @@ void KSMPushButton::keyReleaseEvent( TQKeyEvent* e ) if ( m_pressed ) { setDown(false); - m_pressed = FALSE; + m_pressed = false; emit released(); emit clicked(); } @@ -764,7 +764,7 @@ void FlatButton::keyPressEvent( TQKeyEvent* e ) case Key_Enter: case Key_Return: case Key_Space: - m_pressed = TRUE; + m_pressed = true; setDown(true); emit pressed(); break; @@ -788,7 +788,7 @@ void FlatButton::keyReleaseEvent( TQKeyEvent* e ) if ( m_pressed ) { setDown(false); - m_pressed = FALSE; + m_pressed = false; emit released(); emit clicked(); } diff --git a/tdm/kfrontend/themer/tdmitem.cpp b/tdm/kfrontend/themer/tdmitem.cpp index e89890129..befcb7c35 100644 --- a/tdm/kfrontend/themer/tdmitem.cpp +++ b/tdm/kfrontend/themer/tdmitem.cpp @@ -238,7 +238,7 @@ KdmItem::setWidget( TQWidget *widget ) 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 @@ -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 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/tdmpixmap.cpp b/tdm/kfrontend/themer/tdmpixmap.cpp index fa9e0fcf5..685d1b2c8 100644 --- a/tdm/kfrontend/themer/tdmpixmap.cpp +++ b/tdm/kfrontend/themer/tdmpixmap.cpp @@ -30,7 +30,7 @@ #endif #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqfile.h> #include <tqpainter.h> @@ -73,7 +73,7 @@ KdmPixmap::KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name ) // Software blend only (no compositing support) // Use the preset TDM background... TDEStandardDirs *m_pDirs = TDEGlobal::dirs(); - KSimpleConfig *config = new KSimpleConfig( TQFile::decodeName( _backgroundCfg ) ); + TDESimpleConfig *config = new TDESimpleConfig( TQFile::decodeName( _backgroundCfg ) ); config->setGroup("Desktop0"); pixmap.normal.fullpath = m_pDirs->findResource("wallpaper", config->readPathEntry("Wallpaper")); // TODO: Detect when there is no wallpaper and use the background settings instead diff --git a/tdm/kfrontend/themer/tdmpixmap.h b/tdm/kfrontend/themer/tdmpixmap.h index 90d0a38aa..eb304fde3 100644 --- a/tdm/kfrontend/themer/tdmpixmap.h +++ b/tdm/kfrontend/themer/tdmpixmap.h @@ -27,8 +27,8 @@ //#include <tqrect.h> #include <tqpixmap.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> /* * KdmPixmap. A pixmap element diff --git a/tdm/kfrontend/themer/tdmthemer.cpp b/tdm/kfrontend/themer/tdmthemer.cpp index 16fdf7c89..82ebf55e7 100644 --- a/tdm/kfrontend/themer/tdmthemer.cpp +++ b/tdm/kfrontend/themer/tdmthemer.cpp @@ -31,7 +31,7 @@ #include <kiconloader.h> #include <kimageeffect.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kdebug.h> #include <tqfile.h> @@ -62,7 +62,7 @@ KdmThemer::KdmThemer( const TQString &_filename, const TQString &mode, TQWidget // read the XML file and create DOM tree TQString filename = _filename; if (!::access( TQFile::encodeName( filename + "/GdmGreeterTheme.desktop" ), R_OK )) { - KSimpleConfig cfg( filename + "/GdmGreeterTheme.desktop" ); + TDESimpleConfig cfg( filename + "/GdmGreeterTheme.desktop" ); cfg.setGroup( "GdmGreeterTheme" ); filename += '/' + cfg.readEntry( "Greeter" ); } @@ -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()) ) */ } |
