diff options
Diffstat (limited to 'tdm/kfrontend/kgapp.cpp')
| -rw-r--r-- | tdm/kfrontend/kgapp.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
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 ) ); } |