summaryrefslogtreecommitdiffstats
path: root/kdesktop
diff options
context:
space:
mode:
Diffstat (limited to 'kdesktop')
-rw-r--r--kdesktop/CMakeLists.txt10
-rw-r--r--kdesktop/Makefile.am10
-rw-r--r--kdesktop/bgmanager.cpp (renamed from kdesktop/bgmanager.cc)49
-rw-r--r--kdesktop/bgmanager.h6
-rw-r--r--kdesktop/desktop.cpp (renamed from kdesktop/desktop.cc)102
-rw-r--r--kdesktop/desktop.h4
-rw-r--r--kdesktop/init.cpp (renamed from kdesktop/init.cc)0
-rw-r--r--kdesktop/kcustommenu.cpp (renamed from kdesktop/kcustommenu.cc)2
-rw-r--r--kdesktop/kcustommenu.h2
-rw-r--r--kdesktop/kdesktop.kcfg26
-rw-r--r--kdesktop/kdesktopSetAsBackground.desktop38
-rw-r--r--kdesktop/kdesktopapp.cpp2
-rw-r--r--kdesktop/kdesktopapp.h8
-rw-r--r--kdesktop/kdesktopbindings.cpp24
-rw-r--r--kdesktop/kdiconview.cpp (renamed from kdesktop/kdiconview.cc)185
-rw-r--r--kdesktop/kdiconview.h7
-rw-r--r--kdesktop/krootwm.cpp (renamed from kdesktop/krootwm.cc)122
-rw-r--r--kdesktop/krootwm.h4
-rw-r--r--kdesktop/kwebdesktop/kwebdesktop.cpp18
-rw-r--r--kdesktop/kwebdesktop/kwebdesktop.h6
-rw-r--r--kdesktop/kwebdesktop/kwebdesktop.kcfg2
-rw-r--r--kdesktop/lock/CMakeLists.txt8
-rw-r--r--kdesktop/lock/Makefile.am2
-rw-r--r--kdesktop/lock/autologout.cpp (renamed from kdesktop/lock/autologout.cc)6
-rw-r--r--kdesktop/lock/autologout.h2
-rw-r--r--kdesktop/lock/infodlg.cpp (renamed from kdesktop/lock/infodlg.cc)4
-rw-r--r--kdesktop/lock/infodlg.h2
-rw-r--r--kdesktop/lock/lockdlg.cpp (renamed from kdesktop/lock/lockdlg.cc)89
-rw-r--r--kdesktop/lock/lockdlg.h2
-rw-r--r--kdesktop/lock/lockprocess.cpp (renamed from kdesktop/lock/lockprocess.cc)159
-rw-r--r--kdesktop/lock/lockprocess.h15
-rw-r--r--kdesktop/lock/main.cpp (renamed from kdesktop/lock/main.cc)2
-rw-r--r--kdesktop/lock/main.h4
-rw-r--r--kdesktop/lock/querydlg.cpp (renamed from kdesktop/lock/querydlg.cc)6
-rw-r--r--kdesktop/lock/querydlg.h2
-rw-r--r--kdesktop/lock/sakdlg.cpp (renamed from kdesktop/lock/sakdlg.cc)4
-rw-r--r--kdesktop/lock/sakdlg.h2
-rw-r--r--kdesktop/lock/securedlg.cpp (renamed from kdesktop/lock/securedlg.cc)10
-rw-r--r--kdesktop/lock/securedlg.h2
-rw-r--r--kdesktop/lockeng.cpp (renamed from kdesktop/lockeng.cc)54
-rw-r--r--kdesktop/lockeng.h8
-rw-r--r--kdesktop/main.cpp (renamed from kdesktop/main.cc)6
-rw-r--r--kdesktop/minicli.cpp47
-rw-r--r--kdesktop/minicli.h2
-rw-r--r--kdesktop/minicli_ui.ui11
-rw-r--r--kdesktop/pixmapserver.cpp (renamed from kdesktop/pixmapserver.cc)2
-rw-r--r--kdesktop/pixmapserver.h8
-rw-r--r--kdesktop/startupid.cpp20
-rw-r--r--kdesktop/startupid.h2
-rw-r--r--kdesktop/tdefileividesktop.h2
-rw-r--r--kdesktop/xautolock.cpp (renamed from kdesktop/xautolock.cc)0
-rw-r--r--kdesktop/xautolock.h2
52 files changed, 626 insertions, 486 deletions
diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt
index a4714ce59..ff0394f4b 100644
--- a/kdesktop/CMakeLists.txt
+++ b/kdesktop/CMakeLists.txt
@@ -81,13 +81,13 @@ tde_add_executable( kcheckrunning
##### kdesktop (tdeinit) ########################
set( target kdesktop )
-set_property( SOURCE lockeng.cc APPEND PROPERTY COMPILE_DEFINITIONS KDE_CONFDIR="${TDE_CONFIG_DIR}" )
+set_property( SOURCE lockeng.cpp APPEND PROPERTY COMPILE_DEFINITIONS KDE_CONFDIR="${TDE_CONFIG_DIR}" )
set( ${target}_SRCS
- main.cc krootwm.cc xautolock.cc kdiconview.cc init.cc
- desktop.cc lockeng.cc KDesktopIface.skel bgmanager.cc
+ main.cpp krootwm.cpp xautolock.cpp kdiconview.cpp init.cpp
+ desktop.cpp lockeng.cpp KDesktopIface.skel bgmanager.cpp
KScreensaverIface.skel minicli.cpp KBackgroundIface.skel
- pixmapserver.cc kcustommenu.cc startupid.cpp minicli_ui.ui
+ pixmapserver.cpp kcustommenu.cpp startupid.cpp minicli_ui.ui
xautolock_diy.c xautolock_engine.c kshadowengine.cpp
kshadowsettings.cpp kdesktopshadowsettings.cpp
tdefileividesktop.cpp kdesktopapp.cpp
@@ -97,7 +97,7 @@ tde_add_tdeinit_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
LINK
pthread kdesktopsettings-static bgnd-static dmctl-static
- konq-shared tdeutils-shared tdesu-shared
+ konq-shared tdeutils-shared tdesu-shared ${TDEHW_LIBRARIES}
${XRENDER_LIBRARIES} ${XCURSOR_LIBRARIES} Xext ${DL_LIBRARIES}
${XSS_LIBRARIES} ${DBUS_1_TQT_LIBRARIES}
)
diff --git a/kdesktop/Makefile.am b/kdesktop/Makefile.am
index b28d1ee66..b2d4c2b2c 100644
--- a/kdesktop/Makefile.am
+++ b/kdesktop/Makefile.am
@@ -17,10 +17,10 @@ libkdesktopsettings_la_LDFLAGS = $(all_libraries) -no-undefined
libkdesktopsettings_la_LIBADD = $(LIB_TDECORE)
libkdesktopsettings_la_SOURCES = kdesktopsettings.kcfgc tdelaunchsettings.kcfgc
-kdesktop_la_SOURCES = main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \
- lockeng.cc KDesktopIface.skel \
- bgmanager.cc init.cc KScreensaverIface.skel \
- minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc \
+kdesktop_la_SOURCES = main.cpp krootwm.cpp xautolock.cpp kdiconview.cpp desktop.cpp \
+ lockeng.cpp KDesktopIface.skel \
+ bgmanager.cpp init.cpp KScreensaverIface.skel \
+ minicli.cpp KBackgroundIface.skel pixmapserver.cpp kcustommenu.cpp \
startupid.cpp minicli_ui.ui xautolock_diy.c xautolock_engine.c \
kshadowengine.cpp kshadowsettings.cpp \
kdesktopshadowsettings.cpp tdefileividesktop.cpp \
@@ -59,7 +59,7 @@ startupid.lo: tdelaunchsettings.h
messages: rc.cpp
$(EXTRACTRC) lock/*.ui >> rc.cpp
- $(XGETTEXT) lock/*.cc *.cc *.cpp *.h -o $(podir)/kdesktop.pot
+ $(XGETTEXT) lock/*.cpp *.cpp *.h -o $(podir)/kdesktop.pot
menu_DATA = kdesktop_custom_menu1 kdesktop_custom_menu2
menudir = $(kde_confdir)
diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cpp
index 7c641dd9d..a7078f12e 100644
--- a/kdesktop/bgmanager.cc
+++ b/kdesktop/bgmanager.cpp
@@ -1,5 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
- * kate: space-indent on; tab-width 8; indent-width 4; indent-mode cstyle;
+/*
*
* This file is part of the KDE project, module kdesktop.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
@@ -79,7 +78,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule
m_pDesktop = desktop;
if (desktop == 0L)
- desktop = TQT_TQWIDGET(TDEApplication::desktop()->screen());
+ desktop = TDEApplication::desktop()->screen();
m_Renderer.resize( 1 );
m_Cache.resize( 1 );
@@ -98,40 +97,40 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule
m_Cache[i]->hash = 0;
m_Cache[i]->exp_from = -1;
m_Renderer.insert (i, new KVirtualBGRenderer(i,m_pConfig));
- connect(m_Renderer[i], TQT_SIGNAL(imageDone(int)), TQT_SLOT(slotImageDone(int)));
+ connect(m_Renderer[i], TQ_SIGNAL(imageDone(int)), TQ_SLOT(slotImageDone(int)));
m_Renderer[i]->enableTiling( true ); // optimize
}
#ifdef COMPOSITE
m_tPixmap = new KPixmap(kapp->desktop()->size());
m_tPixmap->fill(TQColor(0, 0x0));
- connect(myApp, TQT_SIGNAL(cmBackgroundChanged( bool )),
- TQT_SLOT(slotCmBackgroundChanged( bool )));
+ connect(myApp, TQ_SIGNAL(cmBackgroundChanged( bool )),
+ TQ_SLOT(slotCmBackgroundChanged( bool )));
#endif
configure();
m_pTimer = new TQTimer(this);
- connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
+ connect(m_pTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()));
m_pTimer->start( 60000 );
/*CrossFade's config*/
m_crossTimer = new TQTimer(this);
- connect(m_crossTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCrossFadeTimeout()));
+ connect(m_crossTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotCrossFadeTimeout()));
resizingDesktop = true;
/*Ends here*/
- connect(m_pKwinmodule, TQT_SIGNAL(currentDesktopChanged(int)),
- TQT_SLOT(slotChangeDesktop(int)));
- connect(m_pKwinmodule, TQT_SIGNAL(numberOfDesktopsChanged(int)),
- TQT_SLOT(slotChangeNumberOfDesktops(int)));
- connect(m_pKwinmodule, TQT_SIGNAL(currentDesktopViewportChanged(int, const TQPoint&)),
- TQT_SLOT(slotChangeViewport(int, const TQPoint&)));
+ connect(m_pKwinmodule, TQ_SIGNAL(currentDesktopChanged(int)),
+ TQ_SLOT(slotChangeDesktop(int)));
+ connect(m_pKwinmodule, TQ_SIGNAL(numberOfDesktopsChanged(int)),
+ TQ_SLOT(slotChangeNumberOfDesktops(int)));
+ connect(m_pKwinmodule, TQ_SIGNAL(currentDesktopViewportChanged(int, const TQPoint&)),
+ TQ_SLOT(slotChangeViewport(int, const TQPoint&)));
#if (TQT_VERSION-0 >= 0x030200)
- connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support
+ connect( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized())); // RANDR support
#endif
TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
@@ -339,7 +338,7 @@ void KBackgroundManager::slotChangeNumberOfDesktops(int num)
m_Cache[i]->hash = 0;
m_Cache[i]->exp_from = -1;
m_Renderer.insert(i, new KVirtualBGRenderer(i,m_pConfig));
- connect(m_Renderer[i], TQT_SIGNAL(imageDone(int)), TQT_SLOT(slotImageDone(int)));
+ connect(m_Renderer[i], TQ_SIGNAL(imageDone(int)), TQ_SLOT(slotImageDone(int)));
m_Renderer[i]->enableTiling( true ); // optimize
}
}
@@ -543,16 +542,16 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk)
if( !root_cleared )
{ // clear the root window pixmap set by tdm
root_cleared = true;
- TQTimer::singleShot( 0, this, TQT_SLOT( clearRoot()));
+ TQTimer::singleShot( 0, this, TQ_SLOT( clearRoot()));
// but make the pixmap visible until m_pDesktop is visible
- TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap(*ep);
- TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
+ TDEApplication::desktop()->screen()->setErasePixmap(*ep);
+ TDEApplication::desktop()->screen()->erase();
}
}
else
{
- TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap(*ep);
- TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
+ TDEApplication::desktop()->screen()->setErasePixmap(*ep);
+ TDEApplication::desktop()->screen()->erase();
}
// and export it via Esetroot-style for gnome/GTK apps to share in the pretties
@@ -572,8 +571,8 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk)
void KBackgroundManager::clearRoot()
{
- TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap( TQPixmap());
- TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
+ TDEApplication::desktop()->screen()->setErasePixmap( TQPixmap());
+ TDEApplication::desktop()->screen()->erase();
}
/*
@@ -682,7 +681,7 @@ void KBackgroundManager::slotImageDone(int desk)
{
m_bBgInitDone = true;
emit initDone();
- TQTimer::singleShot( 30000, this, TQT_SLOT( saveImages()));
+ TQTimer::singleShot( 30000, this, TQ_SLOT( saveImages()));
do_cleanup = false;
}
}
@@ -1005,7 +1004,7 @@ void KBackgroundManager::repaintBackground()
if (m_pDesktop)
m_pDesktop->repaint();
else
- TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase();
+ TDEApplication::desktop()->screen()->erase();
}
void KBackgroundManager::desktopResized()
diff --git a/kdesktop/bgmanager.h b/kdesktop/bgmanager.h
index 43e57a372..d78ebebc3 100644
--- a/kdesktop/bgmanager.h
+++ b/kdesktop/bgmanager.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* This file is part of the KDE project, module kdesktop.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
@@ -16,7 +16,7 @@
#include <tqdatetime.h>
#include <KBackgroundIface.h>
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
+#if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
#define COMPOSITE
#endif
@@ -54,7 +54,7 @@ class KBackgroundManager
: public TQObject,
public KBackgroundIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cpp
index 2732bff08..e7681b1f2 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cpp
@@ -79,13 +79,13 @@ bool KRootWidget::eventFilter ( TQObject *, TQEvent * e )
{
if (e->type() == TQEvent::MouseButtonPress)
{
- TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
+ TQMouseEvent *me = static_cast<TQMouseEvent*>(e);
KRootWm::self()->mousePressed( me->globalPos(), me->button() );
return true;
}
else if (e->type() == TQEvent::Wheel)
{
- TQWheelEvent *we = TQT_TQWHEELEVENT(e);
+ TQWheelEvent *we = static_cast<TQWheelEvent*>(e);
emit wheelRolled(we->delta());
return true;
}
@@ -155,7 +155,7 @@ KDesktop::KDesktop( SaverEngine* saver, bool x_root_hack, bool wait_for_kded ) :
setCaption( "KDE Desktop");
setAcceptDrops(true); // WStyle_Customize seems to disable that
- m_pKwinmodule = new KWinModule( TQT_TQOBJECT(this) );
+ m_pKwinmodule = new KWinModule( this );
kapp->dcopClient()->setNotifications(true);
kapp->dcopClient()->connectDCOPSignal(kicker_name, kicker_name, "desktopIconsAreaChanged(TQRect, int)",
@@ -165,7 +165,7 @@ KDesktop::KDesktop( SaverEngine* saver, bool x_root_hack, bool wait_for_kded ) :
m_bInit = true;
// It's the child widget that gets the focus, not us
- setFocusPolicy( TQ_NoFocus );
+ setFocusPolicy( TQWidget::NoFocus );
if ( x_root_hack )
{
@@ -184,28 +184,28 @@ KDesktop::KDesktop( SaverEngine* saver, bool x_root_hack, bool wait_for_kded ) :
setGeometry( TQApplication::desktop()->geometry() );
lower();
- connect( kapp, TQT_SIGNAL( shutDown() ),
- this, TQT_SLOT( slotShutdown() ) );
+ connect( kapp, TQ_SIGNAL( shutDown() ),
+ this, TQ_SLOT( slotShutdown() ) );
- connect(kapp, TQT_SIGNAL(settingsChanged(int)),
- this, TQT_SLOT(slotSettingsChanged(int)));
+ connect(kapp, TQ_SIGNAL(settingsChanged(int)),
+ this, TQ_SLOT(slotSettingsChanged(int)));
kapp->addKipcEventMask(KIPC::SettingsChanged);
kapp->addKipcEventMask(KIPC::IconChanged);
- connect(kapp, TQT_SIGNAL(iconChanged(int)), this, TQT_SLOT(slotIconChanged(int)));
+ connect(kapp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(slotIconChanged(int)));
- connect(KSycoca::self(), TQT_SIGNAL(databaseChanged()),
- this, TQT_SLOT(slotDatabaseChanged()));
+ connect(KSycoca::self(), TQ_SIGNAL(databaseChanged()),
+ this, TQ_SLOT(slotDatabaseChanged()));
m_pIconView = 0;
m_pRootWidget = 0;
bgMgr = 0;
initRoot();
- TQTimer::singleShot(0, this, TQT_SLOT( slotStart() ));
+ TQTimer::singleShot(0, this, TQ_SLOT( slotStart() ));
#if (TQT_VERSION-0 >= 0x030200) // XRANDR support
- connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized()));
+ connect( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized()));
#endif
}
@@ -238,21 +238,21 @@ KDesktop::initRoot()
XSelectInput(dpy, root, attrs.your_event_mask | ButtonPressMask);
m_pRootWidget = new KRootWidget;
- connect(m_pRootWidget, TQT_SIGNAL(wheelRolled(int)), this, TQT_SLOT(slotSwitchDesktops(int)));
- connect(m_pRootWidget, TQT_SIGNAL(colorDropEvent(TQDropEvent*)), this, TQT_SLOT(handleColorDropEvent(TQDropEvent*)) );
- connect(m_pRootWidget, TQT_SIGNAL(imageDropEvent(TQDropEvent*)), this, TQT_SLOT(handleImageDropEvent(TQDropEvent*)) );
- connect(m_pRootWidget, TQT_SIGNAL(newWallpaper(const KURL&)), this, TQT_SLOT(slotNewWallpaper(const KURL&)) );
+ connect(m_pRootWidget, TQ_SIGNAL(wheelRolled(int)), this, TQ_SLOT(slotSwitchDesktops(int)));
+ connect(m_pRootWidget, TQ_SIGNAL(colorDropEvent(TQDropEvent*)), this, TQ_SLOT(handleColorDropEvent(TQDropEvent*)) );
+ connect(m_pRootWidget, TQ_SIGNAL(imageDropEvent(TQDropEvent*)), this, TQ_SLOT(handleImageDropEvent(TQDropEvent*)) );
+ connect(m_pRootWidget, TQ_SIGNAL(newWallpaper(const KURL&)), this, TQ_SLOT(slotNewWallpaper(const KURL&)) );
// Geert Jansen: backgroundmanager belongs here
// TODO tell KBackgroundManager if we change widget()
bgMgr = new KBackgroundManager( m_pIconView, m_pKwinmodule );
bgMgr->setExport(1);
- connect( bgMgr, TQT_SIGNAL( initDone()), TQT_SLOT( backgroundInitDone()));
+ connect( bgMgr, TQ_SIGNAL( initDone()), TQ_SLOT( backgroundInitDone()));
if (!m_bInit)
{
delete KRootWm::self();
KRootWm* krootwm = new KRootWm( m_pSaver, this ); // handler for root menu (used by kdesktop on RMB click)
- keys->setSlot("Lock Session", krootwm, TQT_SLOT(slotLock()));
+ keys->setSlot("Lock Session", krootwm, TQ_SLOT(slotLock()));
keys->updateConnections();
}
}
@@ -263,24 +263,24 @@ KDesktop::initRoot()
delete m_pRootWidget;
m_pRootWidget = 0;
m_pIconView = new KDIconView( this, 0 );
- connect( m_pIconView, TQT_SIGNAL( imageDropEvent( TQDropEvent * ) ),
- this, TQT_SLOT( handleImageDropEvent( TQDropEvent * ) ) );
- connect( m_pIconView, TQT_SIGNAL( colorDropEvent( TQDropEvent * ) ),
- this, TQT_SLOT( handleColorDropEvent( TQDropEvent * ) ) );
- connect( m_pIconView, TQT_SIGNAL( newWallpaper( const KURL & ) ),
- this, TQT_SLOT( slotNewWallpaper( const KURL & ) ) );
- connect( m_pIconView, TQT_SIGNAL( wheelRolled( int ) ),
- this, TQT_SLOT( slotSwitchDesktops( int ) ) );
-
- // All the QScrollView/QWidget-specific stuff should go here, so that we can use
+ connect( m_pIconView, TQ_SIGNAL( imageDropEvent( TQDropEvent * ) ),
+ this, TQ_SLOT( handleImageDropEvent( TQDropEvent * ) ) );
+ connect( m_pIconView, TQ_SIGNAL( colorDropEvent( TQDropEvent * ) ),
+ this, TQ_SLOT( handleColorDropEvent( TQDropEvent * ) ) );
+ connect( m_pIconView, TQ_SIGNAL( newWallpaper( const KURL & ) ),
+ this, TQ_SLOT( slotNewWallpaper( const KURL & ) ) );
+ connect( m_pIconView, TQ_SIGNAL( wheelRolled( int ) ),
+ this, TQ_SLOT( slotSwitchDesktops( int ) ) );
+
+ // All the QScrollView/TQWidget-specific stuff should go here, so that we can use
// another qscrollview/widget instead of the iconview and use the same code
m_pIconView->setVScrollBarMode( TQScrollView::AlwaysOff );
m_pIconView->setHScrollBarMode( TQScrollView::AlwaysOff );
m_pIconView->setDragAutoScroll( false );
m_pIconView->setFrameStyle( TQFrame::NoFrame );
m_pIconView->viewport()->setBackgroundMode( X11ParentRelative );
- m_pIconView->setFocusPolicy( TQ_StrongFocus );
- m_pIconView->viewport()->setFocusPolicy( TQ_StrongFocus );
+ m_pIconView->setFocusPolicy( TQWidget::StrongFocus );
+ m_pIconView->viewport()->setFocusPolicy( TQWidget::StrongFocus );
m_pIconView->setGeometry( geometry() );
m_pIconView->show();
@@ -288,7 +288,7 @@ KDesktop::initRoot()
// TODO tell KBackgroundManager if we change widget()
bgMgr = new KBackgroundManager( m_pIconView, m_pKwinmodule );
bgMgr->setExport(1);
- connect( bgMgr, TQT_SIGNAL( initDone()), TQT_SLOT( backgroundInitDone()));
+ connect( bgMgr, TQ_SIGNAL( initDone()), TQ_SLOT( backgroundInitDone()));
// make sure it is initialized before we first call updateWorkArea()
m_pIconView->initConfig( m_bInit );
@@ -315,7 +315,7 @@ KDesktop::initRoot()
// if we failed to get the information from kicker wait a little - probably
// this is the KDE startup and kicker is simply not running yet
m_waitForKicker = new TQTimer(this);
- connect(m_waitForKicker, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotNoKicker()));
+ connect(m_waitForKicker, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotNoKicker()));
m_waitForKicker->start(15000, true);
}
else // we are not called from the ctor, so kicker should already run
@@ -330,7 +330,7 @@ KDesktop::initRoot()
m_pIconView->start();
delete KRootWm::self();
KRootWm* krootwm = new KRootWm( m_pSaver, this ); // handler for root menu (used by kdesktop on RMB click)
- keys->setSlot("Lock Session", krootwm, TQT_SLOT(slotLock()));
+ keys->setSlot("Lock Session", krootwm, TQ_SLOT(slotLock()));
keys->updateConnections();
}
} else {
@@ -359,7 +359,7 @@ KDesktop::backgroundInitDone()
// avoid flicker
if (m_bDesktopEnabled)
{
- const TQPixmap *bg = TQT_TQWIDGET(TQApplication::desktop()->screen())->backgroundPixmap();
+ const TQPixmap *bg = TQApplication::desktop()->screen()->backgroundPixmap();
if ( bg )
m_pIconView->setErasePixmap( *bg );
@@ -396,7 +396,7 @@ KDesktop::slotStart()
m_pIconView->start();
// Global keys
- keys = new TDEGlobalAccel( TQT_TQOBJECT(this) );
+ keys = new TDEGlobalAccel( this );
(void) new KRootWm( m_pSaver, this );
#include "kdesktopbindings.cpp"
@@ -404,9 +404,9 @@ KDesktop::slotStart()
keys->readSettings();
keys->updateConnections();
- connect(kapp, TQT_SIGNAL(appearanceChanged()), TQT_SLOT(slotConfigure()));
+ connect(kapp, TQ_SIGNAL(appearanceChanged()), TQ_SLOT(slotConfigure()));
- TQTimer::singleShot(300, this, TQT_SLOT( slotUpAndRunning() ));
+ TQTimer::singleShot(300, this, TQ_SLOT( slotUpAndRunning() ));
}
void
@@ -648,21 +648,21 @@ void KDesktop::setShowDesktop( bool b )
}
// on desktop changes or when a window is deiconified, we abort the show desktop mode
- connect(twinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
- TQT_SLOT(slotCurrentDesktopChanged(int)));
- connect(twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)),
- TQT_SLOT(slotWindowChanged(WId,unsigned int)));
- connect(twinModule(), TQT_SIGNAL(windowAdded(WId)),
- TQT_SLOT(slotWindowAdded(WId)));
+ connect(twinModule(), TQ_SIGNAL(currentDesktopChanged(int)),
+ TQ_SLOT(slotCurrentDesktopChanged(int)));
+ connect(twinModule(), TQ_SIGNAL(windowChanged(WId,unsigned int)),
+ TQ_SLOT(slotWindowChanged(WId,unsigned int)));
+ connect(twinModule(), TQ_SIGNAL(windowAdded(WId)),
+ TQ_SLOT(slotWindowAdded(WId)));
}
else
{
- disconnect(twinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
- this, TQT_SLOT(slotCurrentDesktopChanged(int)));
- disconnect(twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)),
- this, TQT_SLOT(slotWindowChanged(WId,unsigned int)));
- disconnect(twinModule(), TQT_SIGNAL(windowAdded(WId)),
- this, TQT_SLOT(slotWindowAdded(WId)));
+ disconnect(twinModule(), TQ_SIGNAL(currentDesktopChanged(int)),
+ this, TQ_SLOT(slotCurrentDesktopChanged(int)));
+ disconnect(twinModule(), TQ_SIGNAL(windowChanged(WId,unsigned int)),
+ this, TQ_SLOT(slotWindowChanged(WId,unsigned int)));
+ disconnect(twinModule(), TQ_SIGNAL(windowAdded(WId)),
+ this, TQ_SLOT(slotWindowAdded(WId)));
for (TQValueVector<WId>::ConstIterator it = m_iconifiedList.begin();
it != m_iconifiedList.end();
@@ -851,7 +851,7 @@ void KDesktop::slotSetVRoot()
return;
if (KWin::windowInfo(winId()).mappingState() == NET::Withdrawn) {
- TQTimer::singleShot(100, this, TQT_SLOT(slotSetVRoot()));
+ TQTimer::singleShot(100, this, TQ_SLOT(slotSetVRoot()));
return;
}
diff --git a/kdesktop/desktop.h b/kdesktop/desktop.h
index c6a208f07..c85e8b577 100644
--- a/kdesktop/desktop.h
+++ b/kdesktop/desktop.h
@@ -44,7 +44,7 @@ class SaverEngine;
class KRootWidget : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
KRootWidget();
bool eventFilter( TQObject *, TQEvent * e );
@@ -63,7 +63,7 @@ signals:
class KDesktop : public TQWidget,
public KDesktopIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kdesktop/init.cc b/kdesktop/init.cpp
index 6bf87f333..6bf87f333 100644
--- a/kdesktop/init.cc
+++ b/kdesktop/init.cpp
diff --git a/kdesktop/kcustommenu.cc b/kdesktop/kcustommenu.cpp
index 2e825c0d9..cd1287d3d 100644
--- a/kdesktop/kcustommenu.cc
+++ b/kdesktop/kcustommenu.cpp
@@ -57,7 +57,7 @@ KCustomMenu::KCustomMenu(const TQString &configfile, TQWidget *parent)
insertMenuItem( menuItem, -1 );
}
- connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)));
+ connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)));
}
KCustomMenu::~KCustomMenu()
diff --git a/kdesktop/kcustommenu.h b/kdesktop/kcustommenu.h
index 93b8d671f..a8f2cf5c4 100644
--- a/kdesktop/kcustommenu.h
+++ b/kdesktop/kcustommenu.h
@@ -29,7 +29,7 @@
*/
class KCustomMenu : public TQPopupMenu
{
- Q_OBJECT
+ TQ_OBJECT
public:
/**
* Create a custome menu described by @p configfile.
diff --git a/kdesktop/kdesktop.kcfg b/kdesktop/kdesktop.kcfg
index 53a1cc781..183fcc417 100644
--- a/kdesktop/kdesktop.kcfg
+++ b/kdesktop/kdesktop.kcfg
@@ -52,7 +52,7 @@
<default>true</default>
<label></label>
<whatsthis></whatsthis>
- <!-- init.cc:138 -->
+ <!-- init.cpp:138 -->
<!-- if (!config->readBoolEntry("CopyDesktopLinks", true)) -->
</entry>
<entry key="AutoLineUpIcons" type="Bool">
@@ -64,9 +64,9 @@
<default>false</default>
<label>Sort directories first</label>
<whatsthis></whatsthis>
- <!-- krootwm.cc:251 -->
+ <!-- krootwm.cpp:251 -->
<!-- aSortDirsFirst->setChecked( tdeconfig->readBoolEntry("SortDirectoriesFirst", true)); -->
- <!-- krootwm.cc:496 -->
+ <!-- krootwm.cpp:496 -->
<!-- config->writeEntry( "SortDirectoriesFirst", b ); -->
</entry>
<entry key="TerminalApplication" type="Path">
@@ -85,7 +85,7 @@
<default>Forward</default>
<label></label>
<whatsthis></whatsthis>
- <!-- desktop.cc:397 -->
+ <!-- desktop.cpp:397 -->
<!-- (config->readEntry("WheelDirection", default_dir_string) == forward_string) ? Forward : Reverse; -->
</entry>
<entry key="Left" type="String">
@@ -123,7 +123,7 @@
</group>
<group name="FMSettings">
<entry key="NormalTextColor" type="Color"> <!--SHARED-->
- <default>Qt::white</default>
+ <default>TQt::white</default>
<label>Normal text color used for icon labels</label>
<whatsthis></whatsthis>
</entry>
@@ -155,6 +155,16 @@
<label>Align direction</label>
<whatsthis>If this is enabled, icons are aligned vertically, otherwise horizontally.</whatsthis>
</entry>
+ <entry key="IconSpacing" type="Int">
+ <default>5</default>
+ <label>Icon spacing</label>
+ <whatsthis><p>This is the minimal distance (in pixels) between the icons on your desktop.</p></whatsthis>
+ </entry>
+ <entry key="SpacingCtrlScroll" type="Bool">
+ <default>false</default>
+ <label>Change spacing by Ctrl+Mouse Scroll</label>
+ <whatsthis><p>If this is enabled, you can change desktop icon spacing by pressing Ctrl and scrolling on the desktop background.</p></whatsthis>
+ </entry>
<entry key="Preview" type="StringList">
<default></default>
<label>Show Icon Previews For</label>
@@ -190,7 +200,7 @@
<default></default>
<label></label>
<whatsthis></whatsthis>
- <!-- kdiconview.cc:254 -->
+ <!-- kdiconview.cpp:254 -->
<!-- m_itemsAlwaysFirst = config->readListEntry("AlwaysFirstItems"); // Distributor plug-in -->
</entry>
</group>
@@ -199,14 +209,14 @@
<default>true</default>
<label></label>
<whatsthis></whatsthis>
- <!-- kdiconview.cc:258 -->
+ <!-- kdiconview.cpp:258 -->
<!-- m_enableMedia=config->readBoolEntry("enabled",false); -->
</entry>
<entry key="exclude" type="String">
<default>media/nfs_mounted,media/nfs_unmounted,media/hdd_mounted,media/hdd_unmounted,media/floppy_unmounted,media/cdrom_unmounted,media/floppy5_unmounted</default>
<label>Device Types to exclude</label>
<whatsthis>The device types which you do not want to see on the desktop.</whatsthis>
- <!-- kdiconview.cc:261 -->
+ <!-- kdiconview.cpp:261 -->
<!-- TQString tmpList=config->readEntry("exclude","media/hdd_mounted,media/hdd_unmounted,media/floppy_unmounted,media/cdrom_unmounted,media/floppy5_unmounted"); -->
</entry>
<entry name="MediaFreeSpaceDisplayEnabled" key="FreeSpaceDisplayEnabled" type="Bool">
diff --git a/kdesktop/kdesktopSetAsBackground.desktop b/kdesktop/kdesktopSetAsBackground.desktop
index a7ba4f14a..3bc655803 100644
--- a/kdesktop/kdesktopSetAsBackground.desktop
+++ b/kdesktop/kdesktopSetAsBackground.desktop
@@ -1,14 +1,44 @@
[Desktop Entry]
X-TDE-ServiceTypes=image/*
-Actions=setAsBackground;tileAsBackground;
+Actions=centeredAsBackground;tiledAsBackground;centeredTiledAsBackground;centeredMaxpectAsBackground;tiledMaxpectAsBackground;scaledAsBackground;centeredAutoFitAsBackground;scaleAndCropAsBackground
X-TDE-Submenu=Set as Background
-[Desktop Action setAsBackground]
+[Desktop Action centeredAsBackground]
Name=Centered
Icon=background
-Exec=dcop kdesktop KBackgroundIface setWallpaper %u 6
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 1
-[Desktop Action tileAsBackground]
+[Desktop Action tiledAsBackground]
Name=Tiled
Icon=background
Exec=dcop kdesktop KBackgroundIface setWallpaper %u 2
+
+[Desktop Action centeredTiledAsBackground]
+Name=Center Tiled
+Icon=background
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 3
+
+[Desktop Action centeredMaxpectAsBackground]
+Name=Centered Maxpect
+Icon=background
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 4
+
+[Desktop Action tiledMaxpectAsBackground]
+Name=Tiled Maxpect
+Icon=background
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 5
+
+[Desktop Action scaledAsBackground]
+Name=Scaled
+Icon=background
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 6
+
+[Desktop Action centeredAutoFitAsBackground]
+Name=Centered Auto Fit
+Icon=background
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 7
+
+[Desktop Action scaleAndCropAsBackground]
+Name=Scale & Crop
+Icon=background
+Exec=dcop kdesktop KBackgroundIface setWallpaper %u 8
diff --git a/kdesktop/kdesktopapp.cpp b/kdesktop/kdesktopapp.cpp
index ba05dc655..35f763f9c 100644
--- a/kdesktop/kdesktopapp.cpp
+++ b/kdesktop/kdesktopapp.cpp
@@ -27,7 +27,7 @@ KUniqueApplication()
#endif
}
-KDesktopApp::KDesktopApp(Display * dpy, Qt::HANDLE visual, Qt::HANDLE colormap):
+KDesktopApp::KDesktopApp(Display * dpy, TQt::HANDLE visual, TQt::HANDLE colormap):
KUniqueApplication(dpy, visual, colormap)
{
#ifdef COMPOSITE
diff --git a/kdesktop/kdesktopapp.h b/kdesktop/kdesktopapp.h
index 94cdd1d33..1f45ec0a3 100644
--- a/kdesktop/kdesktopapp.h
+++ b/kdesktop/kdesktopapp.h
@@ -23,7 +23,7 @@
#include <config.h>
#include <kuniqueapplication.h>
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
+#if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
#define COMPOSITE
#endif
@@ -35,11 +35,11 @@
class KDesktopApp : public KUniqueApplication
{
- Q_OBJECT
+ TQ_OBJECT
public:
KDesktopApp();
- KDesktopApp(Display * dpy, Qt::HANDLE visual = 0,
- Qt::HANDLE colormap = 0);
+ KDesktopApp(Display * dpy, TQt::HANDLE visual = 0,
+ TQt::HANDLE colormap = 0);
#ifdef COMPOSITE
bool x11EventFilter (XEvent *);
diff --git a/kdesktop/kdesktopbindings.cpp b/kdesktop/kdesktopbindings.cpp
index 91bddb5b3..17b27fc65 100644
--- a/kdesktop/kdesktopbindings.cpp
+++ b/kdesktop/kdesktopbindings.cpp
@@ -1,6 +1,6 @@
#ifndef NOSLOTS
# define DEF( name, key3, key4, fnSlot ) \
- keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) )
+ keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) )
# define DEF2( name, key3, key4, receiver, slot ) \
keys->insert( name, i18n(name), TQString(), key3, key4, receiver, slot );
#else
@@ -17,34 +17,34 @@
if (kapp->authorize("run_command"))
{
#endif
- DEF( I18N_NOOP("Run Command"), ALT+Qt::Key_F2, WIN+Qt::Key_Return, slotExecuteCommand() );
+ DEF( I18N_NOOP("Run Command"), ALT+TQt::Key_F2, WIN+TQt::Key_Return, slotExecuteCommand() );
#ifndef NOSLOTS
}
#endif
- DEF( I18N_NOOP("Show Taskmanager"), CTRL+Qt::Key_Escape, WIN+CTRL+Qt::Key_Pause, slotShowTaskManager() );
- DEF( I18N_NOOP("Show Window List"), ALT+Qt::Key_F5, WIN+Qt::Key_0, slotShowWindowList() );
- DEF( I18N_NOOP("Switch User"), ALT+CTRL+Qt::Key_Insert, WIN+Qt::Key_Insert, slotSwitchUser() );
+ DEF( I18N_NOOP("Show Taskmanager"), CTRL+TQt::Key_Escape, WIN+CTRL+TQt::Key_Pause, slotShowTaskManager() );
+ DEF( I18N_NOOP("Show Window List"), ALT+TQt::Key_F5, WIN+TQt::Key_0, slotShowWindowList() );
+ DEF( I18N_NOOP("Switch User"), ALT+CTRL+TQt::Key_Insert, WIN+TQt::Key_Insert, slotSwitchUser() );
#ifndef NOSLOTS
if (kapp->authorize("lock_screen"))
{
#endif
- DEF2( I18N_NOOP("Lock Session"), ALT+CTRL+Qt::Key_L, WIN+Qt::Key_ScrollLock, KRootWm::self(), TQT_SLOT(slotLock()) );
- DEF2( I18N_NOOP("Lock Session (Hotkey)"), TDEShortcut(TQString("XF86ScreenSaver")), TDEShortcut(TQString("XF86ScreenSaver")), KRootWm::self(), TQT_SLOT(slotLock()) );
+ DEF2( I18N_NOOP("Lock Session"), ALT+CTRL+TQt::Key_L, WIN+TQt::Key_ScrollLock, KRootWm::self(), TQ_SLOT(slotLock()) );
+ DEF2( I18N_NOOP("Lock Session (Hotkey)"), TDEShortcut(TQString("XF86ScreenSaver")), TDEShortcut(TQString("XF86ScreenSaver")), KRootWm::self(), TQ_SLOT(slotLock()) );
#ifndef NOSLOTS
}
if (kapp->authorize("start_screensaver"))
{
#endif
- DEF2( I18N_NOOP("Start Screen Saver"), ALT+CTRL+Qt::Key_S, WIN+Qt::Key_S, KRootWm::self(), TQT_SLOT(slotSave()) );
+ DEF2( I18N_NOOP("Start Screen Saver"), ALT+CTRL+TQt::Key_S, WIN+TQt::Key_S, KRootWm::self(), TQ_SLOT(slotSave()) );
#ifndef NOSLOTS
}
if (kapp->authorize("logout"))
{
#endif
- DEF( I18N_NOOP("Log Out"), ALT+CTRL+Qt::Key_Delete, WIN+Qt::Key_Escape, slotLogout() );
- DEF( I18N_NOOP("Log Out Without Confirmation"), ALT+CTRL+SHIFT+Qt::Key_Delete, WIN+SHIFT+Qt::Key_Escape, slotLogoutNoCnf() );
- DEF( I18N_NOOP("Halt without Confirmation"), ALT+CTRL+SHIFT+Qt::Key_PageDown, WIN+CTRL+SHIFT+Qt::Key_PageDown, slotHaltNoCnf() );
- DEF( I18N_NOOP("Reboot without Confirmation"), ALT+CTRL+SHIFT+Qt::Key_PageUp, WIN+CTRL+SHIFT+Qt::Key_PageUp, slotRebootNoCnf() );
+ DEF( I18N_NOOP("Log Out"), ALT+CTRL+TQt::Key_Delete, WIN+TQt::Key_Escape, slotLogout() );
+ DEF( I18N_NOOP("Log Out Without Confirmation"), ALT+CTRL+SHIFT+TQt::Key_Delete, WIN+SHIFT+TQt::Key_Escape, slotLogoutNoCnf() );
+ DEF( I18N_NOOP("Halt without Confirmation"), ALT+CTRL+SHIFT+TQt::Key_PageDown, WIN+CTRL+SHIFT+TQt::Key_PageDown, slotHaltNoCnf() );
+ DEF( I18N_NOOP("Reboot without Confirmation"), ALT+CTRL+SHIFT+TQt::Key_PageUp, WIN+CTRL+SHIFT+TQt::Key_PageUp, slotRebootNoCnf() );
#ifndef NOSLOTS
}
#endif
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cpp
index c8c5a1fe6..7d79d12cf 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cpp
@@ -162,44 +162,42 @@ KDIconView::KDIconView( TQWidget *parent, const char* name )
// Initialize media handler
mMediaListView = new TQListView();
- connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) );
+ connect( TQApplication::clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotClipboardDataChanged()) );
setURL( desktopURL() ); // sets m_url
m_desktopDirs = TDEGlobal::dirs()->findDirs( "appdata", "Desktop" );
initDotDirectories();
- connect( this, TQT_SIGNAL( executed( TQIconViewItem * ) ),
- TQT_SLOT( slotExecuted( TQIconViewItem * ) ) );
- connect( this, TQT_SIGNAL( returnPressed( TQIconViewItem * ) ),
- TQT_SLOT( slotReturnPressed( TQIconViewItem * ) ) );
- connect( this, TQT_SIGNAL( mouseButtonPressed(int, TQIconViewItem*, const TQPoint&)),
- TQT_SLOT( slotMouseButtonPressed(int, TQIconViewItem*, const TQPoint&)) );
- connect( this, TQT_SIGNAL( mouseButtonClicked(int, TQIconViewItem*, const TQPoint&)),
- TQT_SLOT( slotMouseButtonClickedKDesktop(int, TQIconViewItem*, const TQPoint&)) );
- connect( this, TQT_SIGNAL( contextMenuRequested(TQIconViewItem*, const TQPoint&)),
- TQT_SLOT( slotContextMenuRequested(TQIconViewItem*, const TQPoint&)) );
+ connect( this, TQ_SIGNAL( executed( TQIconViewItem * ) ),
+ TQ_SLOT( slotExecuted( TQIconViewItem * ) ) );
+ connect( this, TQ_SIGNAL( returnPressed( TQIconViewItem * ) ),
+ TQ_SLOT( slotReturnPressed( TQIconViewItem * ) ) );
+ connect( this, TQ_SIGNAL( mouseButtonPressed(int, TQIconViewItem*, const TQPoint&)),
+ TQ_SLOT( slotMouseButtonPressed(int, TQIconViewItem*, const TQPoint&)) );
+ connect( this, TQ_SIGNAL( mouseButtonClicked(int, TQIconViewItem*, const TQPoint&)),
+ TQ_SLOT( slotMouseButtonClickedKDesktop(int, TQIconViewItem*, const TQPoint&)) );
+ connect( this, TQ_SIGNAL( contextMenuRequested(TQIconViewItem*, const TQPoint&)),
+ TQ_SLOT( slotContextMenuRequested(TQIconViewItem*, const TQPoint&)) );
- connect( this, TQT_SIGNAL( enableAction( const char * , bool ) ),
- TQT_SLOT( slotEnableAction( const char * , bool ) ) );
+ connect( this, TQ_SIGNAL( enableAction( const char * , bool ) ),
+ TQ_SLOT( slotEnableAction( const char * , bool ) ) );
// Hack: KonqIconViewWidget::slotItemRenamed is not virtual :-(
- disconnect( this, TQT_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)),
- this, TQT_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) );
- connect( this, TQT_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)),
- this, TQT_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) );
+ disconnect( this, TQ_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)),
+ this, TQ_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) );
+ connect( this, TQ_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)),
+ this, TQ_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) );
if (!m_bEditableDesktopIcons)
{
- setItemsMovable(false);
- setAcceptDrops(false);
- viewport()->setAcceptDrops(false);
+ setIconsLocked(true);
}
}
KDIconView::~KDIconView()
{
- if (m_dotDirectory && !m_bEditableDesktopIcons) {
+ if (m_dotDirectory && !m_bEditableDesktopIcons || m_iconsLocked) {
m_dotDirectory->rollback(false); // Don't save positions
}
@@ -296,6 +294,7 @@ void KDIconView::initConfig( bool init )
m_bVertAlign = KDesktopSettings::vertAlign();
TQStringList oldPreview = previewSettings();
setPreviewSettings( KDesktopSettings::preview() );
+ setSpacing( KDesktopSettings::iconSpacing() );
// read arrange configuration
m_eSortCriterion = (SortCriterion)KDesktopSettings::sortCriterion();
@@ -371,12 +370,12 @@ void KDIconView::start()
m_bNeedSave = false;
- connect( m_dirLister, TQT_SIGNAL( clear() ), this, TQT_SLOT( slotClear() ) );
- connect( m_dirLister, TQT_SIGNAL( started(const KURL&) ), this, TQT_SLOT( slotStarted(const KURL&) ) );
- connect( m_dirLister, TQT_SIGNAL( completed() ), this, TQT_SLOT( slotCompleted() ) );
- connect( m_dirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ), this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) );
- connect( m_dirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ), this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) );
- connect( m_dirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ), this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) );
+ connect( m_dirLister, TQ_SIGNAL( clear() ), this, TQ_SLOT( slotClear() ) );
+ connect( m_dirLister, TQ_SIGNAL( started(const KURL&) ), this, TQ_SLOT( slotStarted(const KURL&) ) );
+ connect( m_dirLister, TQ_SIGNAL( completed() ), this, TQ_SLOT( slotCompleted() ) );
+ connect( m_dirLister, TQ_SIGNAL( newItems( const KFileItemList & ) ), this, TQ_SLOT( slotNewItems( const KFileItemList & ) ) );
+ connect( m_dirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ), this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) );
+ connect( m_dirLister, TQ_SIGNAL( refreshItems( const KFileItemList & ) ), this, TQ_SLOT( slotRefreshItems( const KFileItemList & ) ) );
// Start the directory lister !
m_dirLister->setShowingDotFiles( m_bShowDot );
@@ -421,35 +420,35 @@ void KDIconView::createActions()
{
if (m_bEditableDesktopIcons)
{
- TDEAction *undo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), &m_actionCollection, "undo" );
- connect( KonqUndoManager::self(), TQT_SIGNAL( undoAvailable( bool ) ),
- undo, TQT_SLOT( setEnabled( bool ) ) );
- connect( KonqUndoManager::self(), TQT_SIGNAL( undoTextChanged( const TQString & ) ),
- undo, TQT_SLOT( setText( const TQString & ) ) );
+ TDEAction *undo = KStdAction::undo( KonqUndoManager::self(), TQ_SLOT( undo() ), &m_actionCollection, "undo" );
+ connect( KonqUndoManager::self(), TQ_SIGNAL( undoAvailable( bool ) ),
+ undo, TQ_SLOT( setEnabled( bool ) ) );
+ connect( KonqUndoManager::self(), TQ_SIGNAL( undoTextChanged( const TQString & ) ),
+ undo, TQ_SLOT( setText( const TQString & ) ) );
undo->setEnabled( KonqUndoManager::self()->undoAvailable() );
- TDEAction* paCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( slotCut() ), &m_actionCollection, "cut" );
+ TDEAction* paCut = KStdAction::cut( this, TQ_SLOT( slotCut() ), &m_actionCollection, "cut" );
TDEShortcut cutShortCut = paCut->shortcut();
cutShortCut.remove( KKey( SHIFT + Key_Delete ) ); // used for deleting files
paCut->setShortcut( cutShortCut );
- KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), &m_actionCollection, "copy" );
- KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPaste() ), &m_actionCollection, "paste" );
- TDEAction *pasteTo = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPopupPasteTo() ), &m_actionCollection, "pasteto" );
+ KStdAction::copy( this, TQ_SLOT( slotCopy() ), &m_actionCollection, "copy" );
+ KStdAction::paste( this, TQ_SLOT( slotPaste() ), &m_actionCollection, "paste" );
+ TDEAction *pasteTo = KStdAction::paste( this, TQ_SLOT( slotPopupPasteTo() ), &m_actionCollection, "pasteto" );
pasteTo->setEnabled( false ); // only enabled during popupMenu()
TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload);
- new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( refreshIcons() ), &m_actionCollection, "reload" );
+ new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQ_SLOT( refreshIcons() ), &m_actionCollection, "reload" );
- (void) new TDEAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, TQT_TQOBJECT(this), TQT_SLOT( renameSelectedItem() ), &m_actionCollection, "rename" );
- (void) new TDEAction( i18n( "&Properties" ), ALT+Key_Return, TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), &m_actionCollection, "properties" );
+ (void) new TDEAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, this, TQ_SLOT( renameSelectedItem() ), &m_actionCollection, "rename" );
+ (void) new TDEAction( i18n( "&Properties" ), ALT+Key_Return, this, TQ_SLOT( slotProperties() ), &m_actionCollection, "properties" );
TDEAction* trash = new TDEAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, &m_actionCollection, "trash" );
- connect( trash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
- this, TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
+ connect( trash, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
+ this, TQ_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
TDEConfig config("kdeglobals", true, false);
config.setGroup( "KDE" );
- (void) new TDEAction( i18n( "&Delete" ), "edit-delete", SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), &m_actionCollection, "del" );
+ (void) new TDEAction( i18n( "&Delete" ), "edit-delete", SHIFT+Key_Delete, this, TQ_SLOT( slotDelete() ), &m_actionCollection, "del" );
// Initial state of the actions (cut/copy/paste/...)
slotSelectionChanged();
@@ -486,6 +485,30 @@ void KDIconView::lineupIcons()
saveIconPositions();
}
+void KDIconView::incIconSpacing()
+{
+ if ( m_autoAlign && !KDesktopSettings::lockIcons() && KDesktopSettings::spacingCtrlScroll() )
+ {
+ setSpacing( ( spacing() + 1 ) );
+ lineupIcons();
+
+ KDesktopSettings::setIconSpacing( spacing() );
+ KDesktopSettings::writeConfig();
+ }
+}
+
+void KDIconView::decIconSpacing()
+{
+ if ( m_autoAlign && !KDesktopSettings::lockIcons() && KDesktopSettings::spacingCtrlScroll() && spacing() > 5 )
+ {
+ setSpacing( ( spacing() - 1 ) );
+ lineupIcons();
+
+ KDesktopSettings::setIconSpacing( spacing() );
+ KDesktopSettings::writeConfig();
+ }
+}
+
void KDIconView::setAutoAlign( bool b )
{
m_autoAlign = b;
@@ -503,8 +526,8 @@ void KDIconView::setAutoAlign( bool b )
else {
KRootWm::self()->startup = false;
}
- connect( this, TQT_SIGNAL( iconMoved() ),
- this, TQT_SLOT( lineupIcons() ) );
+ connect( this, TQ_SIGNAL( iconMoved() ),
+ this, TQ_SLOT( lineupIcons() ) );
}
else {
// change maxItemWidth, because when grid-align was active, it changed this for the grid
@@ -512,11 +535,20 @@ void KDIconView::setAutoAlign( bool b )
setMaxItemWidth( TQMAX( TQMAX( sz, previewIconSize( iconSize() ) ), KonqFMSettings::settings()->iconTextWidth() ) );
setFont( font() ); // Force calcRect()
- disconnect( this, TQT_SIGNAL( iconMoved() ),
- this, TQT_SLOT( lineupIcons() ) );
+ disconnect( this, TQ_SIGNAL( iconMoved() ),
+ this, TQ_SLOT( lineupIcons() ) );
}
}
+void KDIconView::setIconsLocked( bool lock )
+{
+ m_iconsLocked = lock;
+
+ setItemsMovable(!lock);
+ setAcceptDrops(!lock);
+ viewport()->setAcceptDrops(!lock);
+}
+
void KDIconView::startDirLister()
{
// if desktop is resized before start() is called (XRandr)
@@ -618,7 +650,7 @@ void KDIconView::contentsMousePressEvent( TQMouseEvent *e )
if (!m_dirLister) return;
//kdDebug(1204) << "KDIconView::contentsMousePressEvent" << endl;
// TQIconView, as of Qt 2.2, doesn't emit mouseButtonPressed for LMB on background
- if ( e->button() == Qt::LeftButton && KRootWm::self()->hasLeftButtonMenu() )
+ if ( e->button() == TQt::LeftButton && KRootWm::self()->hasLeftButtonMenu() )
{
TQIconViewItem *item = findItem( e->pos() );
if ( !item )
@@ -644,7 +676,22 @@ void KDIconView::wheelEvent( TQWheelEvent* e )
TQIconViewItem *item = findItem( e->pos() );
if ( !item )
{
- emit wheelRolled( e->delta() );
+ TQWheelEvent *we = static_cast<TQWheelEvent*>(e);
+
+ if ( we->state() == ControlButton )
+ {
+ if ( we->delta() >= 0 )
+ incIconSpacing();
+ else
+ decIconSpacing();
+
+ we->accept();
+ }
+ else
+ {
+ emit wheelRolled( e->delta() );
+ }
+
return;
}
@@ -684,7 +731,7 @@ void KDIconView::slotMouseButtonClickedKDesktop(int _button, TQIconViewItem* _it
{
if (!m_dirLister) return;
//kdDebug(1204) << "KDIconView::slotMouseButtonClickedKDesktop" << endl;
- if ( _item && _button == Qt::MidButton ) {
+ if ( _item && _button == TQt::MidButton ) {
slotExecuted(_item);
}
}
@@ -1399,7 +1446,7 @@ void KDIconView::showFreeSpaceOverlay(KFileIVI* item)
if (!m_paOutstandingFreeSpaceOverlaysTimer)
{
m_paOutstandingFreeSpaceOverlaysTimer = new TQTimer(this);
- connect(m_paOutstandingFreeSpaceOverlaysTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotFreeSpaceOverlayStart()));
+ connect(m_paOutstandingFreeSpaceOverlaysTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotFreeSpaceOverlayStart()));
}
m_paOutstandingFreeSpaceOverlaysTimer->start(20, true);
}
@@ -1419,7 +1466,7 @@ void KDIconView::slotFreeSpaceOverlayStart()
if (overlay)
{
- connect( overlay, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotFreeSpaceOverlayFinished() ) );
+ connect( overlay, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotFreeSpaceOverlayFinished() ) );
overlay->start(); // Watch out, may emit finished() immediately!!
return; // Let it run....
}
@@ -1620,7 +1667,7 @@ void KDIconView::slotAboutToCreate(const TQPoint &pos, const TQValueList<TDEIO::
saveIconPosition(m_dotDirectory, m_lastDropPos.x(), m_lastDropPos.y());
int dX = m_lastDropPos.x() - m_dropPos.x();
int dY = m_lastDropPos.y() - m_dropPos.y();
- if ((QABS(dX) > QABS(dY)) || (m_lastDropPos.x() + 2*gridX > width()))
+ if ((TQABS(dX) > TQABS(dY)) || (m_lastDropPos.x() + 2*gridX > width()))
m_lastDropPos = TQPoint(m_dropPos.x(), m_lastDropPos.y() + gridY);
else
m_lastDropPos = TQPoint(m_lastDropPos.x() + gridX, m_lastDropPos.y());
@@ -1726,25 +1773,25 @@ void KDIconView::viewportWheelEvent( TQWheelEvent * e )
void KDIconView::updateWorkArea( const TQRect &wr )
{
m_gotIconsArea = true; // now we have it!
-
+
if (( iconArea() == wr ) && (m_needDesktopAlign == false)) {
// nothing changed; avoid repaint/saveIconPosition ...
return;
}
-
+
TQRect oldArea = iconArea();
setIconArea( wr );
-
+
kdDebug(1204) << "KDIconView::updateWorkArea wr: " << wr.x() << "," << wr.y() << " " << wr.width() << "x" << wr.height() << endl;
kdDebug(1204) << " oldArea: " << oldArea.x() << "," << oldArea.y() << " " << oldArea.width() << "x" << oldArea.height() << endl;
-
+
bool needRepaint = false;
TQIconViewItem* item;
int dx, dy;
-
+
dx = wr.left() - oldArea.left();
dy = wr.top() - oldArea.top();
-
+
if ( dx != 0 || dy != 0 ) {
if ( (dx > 0) || (dy > 0) ) {
// the iconArea was shifted right/down; less space now
@@ -1762,14 +1809,14 @@ void KDIconView::updateWorkArea( const TQRect &wr )
// the iconArea was shifted left/up; more space now - use it
needRepaint = true;
}
-
+
if ( needRepaint ) {
for ( item = firstItem(); item; item = item->nextItem() ) {
item->moveBy( dx, dy );
}
}
}
-
+
for ( item = firstItem(); item; item = item->nextItem() ) {
TQRect r( item->rect() );
int dx = 0, dy = 0;
@@ -1789,7 +1836,7 @@ void KDIconView::updateWorkArea( const TQRect &wr )
repaint( FALSE );
saveIconPositions();
}
-
+
m_needDesktopAlign = false;
lineupIcons();
}
@@ -1861,18 +1908,18 @@ bool KDIconView::isFreePosition( const TQIconViewItem *item, const TQRect &curre
if (!area.contains(r, FALSE)) {
return false;
}
-
+
TQIconViewItem *it = firstItem();
for (; it; it = it->nextItem() ) {
if ( !it->rect().isValid() || it == item ) {
continue;
}
-
+
if ( it->intersects( r ) ) {
return false;
}
}
-
+
return true;
}
@@ -1891,12 +1938,12 @@ bool KDIconView::isFreePosition( const TQIconViewItem *item, const TQRect& rect,
if ( !rect.isValid() || it == item ) {
continue;
}
-
+
if ( it->intersects( rect ) ) {
return false;
}
}
-
+
return true;
}
@@ -1921,12 +1968,12 @@ void KDIconView::moveToFreePosition(TQIconViewItem *item, const TQRect &currentI
m_lastDeletedIconPos = TQPoint();
return;
}
-
+
//try to find a free place to put the item, honouring the m_bVertAlign property
TQRect rect=item->rect();
if (m_bVertAlign) {
kdDebug(1214)<<"moveToFreePosition for vertical alignment"<<endl;
-
+
rect.moveTopLeft(TQPoint(currentIconArea.x()+spacing(),currentIconArea.y()+spacing()));
do {
success=false;
@@ -1939,7 +1986,7 @@ void KDIconView::moveToFreePosition(TQIconViewItem *item, const TQRect &currentI
break;
}
}
-
+
if (!success) {
rect.moveTopLeft(TQPoint(rect.right()+spacing(),spacing()));
}
diff --git a/kdesktop/kdiconview.h b/kdesktop/kdiconview.h
index 7b20e1817..61d35560a 100644
--- a/kdesktop/kdiconview.h
+++ b/kdesktop/kdiconview.h
@@ -48,7 +48,7 @@ class KDesktopShadowSettings;
*/
class KDIconView : public KonqIconViewWidget, public KDirNotify
{
- Q_OBJECT
+ TQ_OBJECT
public:
KDIconView( TQWidget *parent, const char* name = 0L );
@@ -75,6 +75,7 @@ public:
void lineupIcons(TQIconView::Arrangement);
+ void setIconsLocked( bool b );
void setAutoAlign( bool b );
TQStringList selectedURLs();
@@ -165,6 +166,9 @@ public slots:
void slotClear();
void refreshIcons();
+ void incIconSpacing();
+ void decIconSpacing();
+
protected slots:
void slotFreeSpaceOverlayStart();
void slotFreeSpaceOverlayFinished();
@@ -214,6 +218,7 @@ private:
bool m_bNeedRepaint;
bool m_bNeedSave;
+ bool m_iconsLocked;
bool m_autoAlign;
/** true if even one icon has an icon-position entry in the .directory */
diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cpp
index 9c68fc740..b33ef60d4 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cpp
@@ -1,5 +1,5 @@
/*
- * krootwm.cc Part of the KDE project.
+ * krootwm.cpp Part of the KDE project.
*
* Copyright (C) 1997 Matthias Ettrich
* (C) 1997 Torben Weis, weis@kde.org
@@ -89,10 +89,10 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
if (m_bDesktopEnabled && kapp->authorize("editable_desktop_icons"))
{
menuNew = new KNewMenu( m_actionCollection, "new_menu" );
- connect(menuNew->popupMenu(), TQT_SIGNAL( aboutToShow() ),
- this, TQT_SLOT( slotFileNewAboutToShow() ) );
- connect( menuNew, TQT_SIGNAL( activated() ),
- m_pDesktop->iconView(), TQT_SLOT( slotNewMenuActivated() ) );
+ connect(menuNew->popupMenu(), TQ_SIGNAL( aboutToShow() ),
+ this, TQ_SLOT( slotFileNewAboutToShow() ) );
+ connect( menuNew, TQ_SIGNAL( activated() ),
+ m_pDesktop->iconView(), TQ_SLOT( slotNewMenuActivated() ) );
}
if (kapp->authorizeTDEAction("bookmarks"))
@@ -109,13 +109,13 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
bookmarks = 0;
bookmarkMenu = 0;
}
-
+
// The windowList and desktop menus can be part of a menubar (Mac style)
// so we create them here
desktopMenu = new TQPopupMenu;
windowListMenu = new KWindowListMenu;
- connect( windowListMenu, TQT_SIGNAL( aboutToShow() ),
- this, TQT_SLOT( slotWindowListAboutToShow() ) );
+ connect( windowListMenu, TQ_SIGNAL( aboutToShow() ),
+ this, TQ_SLOT( slotWindowListAboutToShow() ) );
// Create the actions
#if 0
@@ -134,80 +134,80 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop),
if (kapp->authorize("run_command"))
{
- new TDEAction(i18n("Run Command..."), "system-run", 0, TQT_TQOBJECT(m_pDesktop), TQT_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
- new TDEAction(i18n("Open Terminal Here..." ), "terminal", CTRL+Key_T, this, TQT_SLOT( slotOpenTerminal() ),
+ new TDEAction(i18n("Run Command..."), "system-run", 0, m_pDesktop, TQ_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
+ new TDEAction(i18n("Open Terminal Here..." ), "terminal", CTRL+Key_T, this, TQ_SLOT( slotOpenTerminal() ),
m_actionCollection, "open_terminal" );
}
if (!TDEGlobal::config()->isImmutable())
{
- new TDEAction(i18n("Configure Desktop..."), "configure", 0, this, TQT_SLOT( slotConfigureDesktop() ),
+ new TDEAction(i18n("Configure Desktop..."), "configure", 0, this, TQ_SLOT( slotConfigureDesktop() ),
m_actionCollection, "configdesktop" );
- new TDEAction(i18n("Disable Desktop Menu"), 0, this, TQT_SLOT( slotToggleDesktopMenu() ),
+ new TDEAction(i18n("Disable Desktop Menu"), 0, this, TQ_SLOT( slotToggleDesktopMenu() ),
m_actionCollection, "togglemenubar" );
}
- new TDEAction(i18n("Unclutter Windows"), 0, this, TQT_SLOT( slotUnclutterWindows() ),
+ new TDEAction(i18n("Unclutter Windows"), 0, this, TQ_SLOT( slotUnclutterWindows() ),
m_actionCollection, "unclutter" );
- new TDEAction(i18n("Cascade Windows"), 0, this, TQT_SLOT( slotCascadeWindows() ),
+ new TDEAction(i18n("Cascade Windows"), 0, this, TQ_SLOT( slotCascadeWindows() ),
m_actionCollection, "cascade" );
// arrange menu actions
if (m_bDesktopEnabled && kapp->authorize("editable_desktop_icons"))
{
- new TDEAction(i18n("By Name (Case Sensitive)"), 0, this, TQT_SLOT( slotArrangeByNameCS() ),
+ new TDEAction(i18n("By Name (Case Sensitive)"), 0, this, TQ_SLOT( slotArrangeByNameCS() ),
m_actionCollection, "sort_ncs");
- new TDEAction(i18n("By Name (Case Insensitive)"), 0, this, TQT_SLOT( slotArrangeByNameCI() ),
+ new TDEAction(i18n("By Name (Case Insensitive)"), 0, this, TQ_SLOT( slotArrangeByNameCI() ),
m_actionCollection, "sort_nci");
- new TDEAction(i18n("By Size"), 0, this, TQT_SLOT( slotArrangeBySize() ),
+ new TDEAction(i18n("By Size"), 0, this, TQ_SLOT( slotArrangeBySize() ),
m_actionCollection, "sort_size");
- new TDEAction(i18n("By Type"), 0, this, TQT_SLOT( slotArrangeByType() ),
+ new TDEAction(i18n("By Type"), 0, this, TQ_SLOT( slotArrangeByType() ),
m_actionCollection, "sort_type");
- new TDEAction(i18n("By Date"), 0, this, TQT_SLOT( slotArrangeByDate() ),
+ new TDEAction(i18n("By Date"), 0, this, TQ_SLOT( slotArrangeByDate() ),
m_actionCollection, "sort_date");
TDEToggleAction *aSortDirsFirst = new TDEToggleAction( i18n("Directories First"), 0, m_actionCollection, "sort_directoriesfirst" );
- connect( aSortDirsFirst, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotToggleDirFirst( bool ) ) );
+ connect( aSortDirsFirst, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotToggleDirFirst( bool ) ) );
new TDEAction(i18n("Line Up Horizontally"), 0,
- this, TQT_SLOT( slotLineupIconsHoriz() ),
+ this, TQ_SLOT( slotLineupIconsHoriz() ),
m_actionCollection, "lineupHoriz" );
new TDEAction(i18n("Line Up Vertically"), 0,
- this, TQT_SLOT( slotLineupIconsVert() ),
+ this, TQ_SLOT( slotLineupIconsVert() ),
m_actionCollection, "lineupVert" );
TDEToggleAction *aAutoAlign = new TDEToggleAction(i18n("Align to Grid"), 0,
m_actionCollection, "realign" );
- connect( aAutoAlign, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotToggleAutoAlign( bool ) ) );
+ connect( aAutoAlign, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotToggleAutoAlign( bool ) ) );
TDEToggleAction *aLockIcons = new TDEToggleAction(i18n("Lock in Place"), 0, m_actionCollection, "lock_icons");
- connect( aLockIcons, TQT_SIGNAL( toggled( bool ) ),
- this, TQT_SLOT( slotToggleLockIcons( bool ) ) );
+ connect( aLockIcons, TQ_SIGNAL( toggled( bool ) ),
+ this, TQ_SLOT( slotToggleLockIcons( bool ) ) );
}
if (m_bDesktopEnabled)
{
- new TDEAction(i18n("Refresh Desktop"), "desktop", 0, this, TQT_SLOT( slotRefreshDesktop() ),
+ new TDEAction(i18n("Refresh Desktop"), "desktop", 0, this, TQ_SLOT( slotRefreshDesktop() ),
m_actionCollection, "refresh" );
}
// Icons in sync with kicker
if (kapp->authorize("lock_screen"))
{
- new TDEAction(i18n("Lock Session"), "system-lock-screen", 0, this, TQT_SLOT( slotLock() ),
+ new TDEAction(i18n("Lock Session"), "system-lock-screen", 0, this, TQ_SLOT( slotLock() ),
m_actionCollection, "lock" );
}
if (kapp->authorize("logout"))
{
new TDEAction(i18n("Log Out \"%1\"...").arg(KUser().loginName()), "system-log-out", 0,
- this, TQT_SLOT( slotLogout() ), m_actionCollection, "logout" );
+ this, TQ_SLOT( slotLogout() ), m_actionCollection, "logout" );
}
if (kapp->authorize("start_new_session") && DM().isSwitchable())
{
new TDEAction(i18n("Start New Session"), "fork", 0, this,
- TQT_SLOT( slotNewSession() ), m_actionCollection, "newsession" );
+ TQ_SLOT( slotNewSession() ), m_actionCollection, "newsession" );
if (kapp->authorize("lock_screen"))
{
new TDEAction(i18n("Lock Current && Start New Session"), "system-lock-screen", 0, this,
- TQT_SLOT( slotLockNNewSession() ), m_actionCollection, "lockNnewsession" );
+ TQ_SLOT( slotLockNNewSession() ), m_actionCollection, "lockNnewsession" );
}
}
@@ -250,7 +250,7 @@ void KRootWm::initConfig()
if ( m_bDesktopEnabled ) {
m_pDesktop->iconView()->setAutoAlign( KDesktopSettings::autoLineUpIcons() );
if ( kapp->authorize( "editable_desktop_icons" ) ) {
- m_pDesktop->iconView()->setItemsMovable( !KDesktopSettings::lockIcons() );
+ m_pDesktop->iconView()->setIconsLocked( KDesktopSettings::lockIcons() );
TDEToggleAction *aLockIcons = static_cast<TDEToggleAction*>(m_actionCollection->action("lock_icons"));
if (aLockIcons)
aLockIcons->setChecked( KDesktopSettings::lockIcons() );
@@ -314,8 +314,8 @@ void KRootWm::buildMenus()
if (m_actionCollection->action("newsession"))
{
sessionsMenu = new TQPopupMenu;
- connect( sessionsMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotPopulateSessions()) );
- connect( sessionsMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSessionActivated(int)) );
+ connect( sessionsMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotPopulateSessions()) );
+ connect( sessionsMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSessionActivated(int)) );
}
if (menuBar) {
@@ -450,7 +450,7 @@ void KRootWm::buildMenus()
TQPopupMenu* pWindowOperationsMenu = new TQPopupMenu;
m_actionCollection->action("cascade")->plug( pWindowOperationsMenu );
m_actionCollection->action("unclutter")->plug( pWindowOperationsMenu );
- desktopMenu->insertItem(SmallIconSet("window_list"), i18n("Windows"), pWindowOperationsMenu);
+ desktopMenu->insertItem(SmallIconSet("window_duplicate"), i18n("Windows"), pWindowOperationsMenu);
if (m_bDesktopEnabled)
{
@@ -489,7 +489,7 @@ void KRootWm::buildMenus()
desktopMenu->removeItem(lastSep);
}
- connect( desktopMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotFileNewAboutToShow() ) );
+ connect( desktopMenu, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotFileNewAboutToShow() ) );
if (menuBar) {
menuBar->insertItem(i18n("File"), file);
@@ -609,15 +609,15 @@ void KRootWm::mousePressed( const TQPoint& _global, int _button )
{
if (!desktopMenu) return; // initialisation not yet done
switch ( _button ) {
- case Qt::LeftButton:
+ case TQt::LeftButton:
if ( m_bShowMenuBar && menuBar )
menuBar->raise();
activateMenu( leftButtonChoice, _global );
break;
- case Qt::MidButton:
+ case TQt::MidButton:
activateMenu( middleButtonChoice, _global );
break;
- case Qt::RightButton:
+ case TQt::RightButton:
if (!kapp->authorize("action/kdesktop_rmb")) return;
activateMenu( rightButtonChoice, _global );
break;
@@ -637,13 +637,13 @@ void KRootWm::slotWindowList() {
else
r = desktop->screenGeometry( desktop->screenNumber(TQCursor::pos()));
windowListMenu->init();
- disconnect( windowListMenu, TQT_SIGNAL( aboutToShow() ),
- this, TQT_SLOT( slotWindowListAboutToShow() ) ); // avoid calling init() twice
+ disconnect( windowListMenu, TQ_SIGNAL( aboutToShow() ),
+ this, TQ_SLOT( slotWindowListAboutToShow() ) ); // avoid calling init() twice
// windowListMenu->rect() is not valid before showing, use sizeHint()
windowListMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), windowListMenu->sizeHint()).center());
windowListMenu->selectActiveWindow(); // make the popup more useful
- connect( windowListMenu, TQT_SIGNAL( aboutToShow() ),
- this, TQT_SLOT( slotWindowListAboutToShow() ) );
+ connect( windowListMenu, TQ_SIGNAL( aboutToShow() ),
+ this, TQ_SLOT( slotWindowListAboutToShow() ) );
}
void KRootWm::slotSwitchUser() {
@@ -657,11 +657,11 @@ void KRootWm::slotSwitchUser() {
else
r = desktop->screenGeometry( desktop->screenNumber(TQCursor::pos()));
slotPopulateSessions();
- disconnect( sessionsMenu, TQT_SIGNAL( aboutToShow() ),
- this, TQT_SLOT( slotPopulateSessions() ) ); // avoid calling init() twice
+ disconnect( sessionsMenu, TQ_SIGNAL( aboutToShow() ),
+ this, TQ_SLOT( slotPopulateSessions() ) ); // avoid calling init() twice
sessionsMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), sessionsMenu->sizeHint()).center());
- connect( sessionsMenu, TQT_SIGNAL( aboutToShow() ),
- TQT_SLOT( slotPopulateSessions() ) );
+ connect( sessionsMenu, TQ_SIGNAL( aboutToShow() ),
+ TQ_SLOT( slotPopulateSessions() ) );
}
void KRootWm::slotArrangeByNameCS()
@@ -732,12 +732,24 @@ void KRootWm::slotLineupIcons() {
void KRootWm::slotToggleLockIcons( bool lock )
{
- if (m_bDesktopEnabled)
- {
- m_pDesktop->iconView()->setItemsMovable( !lock );
- KDesktopSettings::setLockIcons( lock );
- KDesktopSettings::writeConfig();
- }
+ KDesktopSettings::setLockIcons( lock );
+ KDesktopSettings::writeConfig();
+
+ // Also save it globally...
+ int desktop = TDEApplication::desktop()->primaryScreen();
+ TQCString cfilename;
+ if (desktop == 0)
+ cfilename = "kdesktoprc";
+ else
+ cfilename.sprintf("kdesktop-screen-%drc", desktop);
+
+ TDEConfig *kdg_config = new TDEConfig(cfilename, false, false);
+ kdg_config->setGroup( "General" );
+ kdg_config->writeEntry( "LockIcons", lock );
+ kdg_config->sync();
+ delete kdg_config;
+
+ m_pDesktop->iconView()->setIconsLocked( lock );
}
void KRootWm::slotRefreshDesktop() {
@@ -774,7 +786,7 @@ void KRootWm::slotConfigureDesktop() {
if (!m_configDialog)
{
m_configDialog = new KCMultiDialog( (TQWidget*)0, "configureDialog" );
- connect(m_configDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(slotConfigClosed()));
+ connect(m_configDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(slotConfigClosed()));
TQStringList modules = configModules();
for (TQStringList::const_iterator it = modules.constBegin(); it != modules.constEnd(); ++it)
diff --git a/kdesktop/krootwm.h b/kdesktop/krootwm.h
index 8fb5af8b9..efdd64c3e 100644
--- a/kdesktop/krootwm.h
+++ b/kdesktop/krootwm.h
@@ -64,7 +64,7 @@ class KRootWmThreadHelperObject;
* This class is the handler for the menus (root popup menu and desktop menubar)
*/
class KRootWm: public TQObject {
- Q_OBJECT
+ TQ_OBJECT
public:
KRootWm(SaverEngine*, KDesktop*);
@@ -80,7 +80,7 @@ public:
static KRootWm * self() { return s_rootWm; }
/**
- * share this with desktop.cc
+ * share this with desktop.cpp
*/
KNewMenu * newMenu() const { return menuNew; }
diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp
index 1e2499ea2..67a55192f 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.cpp
+++ b/kdesktop/kwebdesktop/kwebdesktop.cpp
@@ -52,10 +52,10 @@ KWebDesktopRun::KWebDesktopRun( KWebDesktop* webDesktop, const KURL & url )
{
kdDebug() << "KWebDesktopRun::KWebDesktopRun starting get" << endl;
TDEIO::Job * job = TDEIO::get(m_url, false, false);
- connect( job, TQT_SIGNAL( result( TDEIO::Job *)),
- this, TQT_SLOT( slotFinished(TDEIO::Job *)));
- connect( job, TQT_SIGNAL( mimetype( TDEIO::Job *, const TQString &)),
- this, TQT_SLOT( slotMimetype(TDEIO::Job *, const TQString &)));
+ connect( job, TQ_SIGNAL( result( TDEIO::Job *)),
+ this, TQ_SLOT( slotFinished(TDEIO::Job *)));
+ connect( job, TQ_SIGNAL( mimetype( TDEIO::Job *, const TQString &)),
+ this, TQ_SLOT( slotMimetype(TDEIO::Job *, const TQString &)));
}
void KWebDesktopRun::slotMimetype( TDEIO::Job *job, const TQString &_type )
@@ -166,7 +166,7 @@ KParts::ReadOnlyPart* KWebDesktop::createPart( const TQString& mimeType )
((TQScrollView *)htmlPart->widget())->setHScrollBarMode( TQScrollView::AlwaysOff );
((TQScrollView *)htmlPart->widget())->setVScrollBarMode( TQScrollView::AlwaysOff );
- connect( htmlPart, TQT_SIGNAL( completed() ), this, TQT_SLOT( slotCompleted() ) );
+ connect( htmlPart, TQ_SIGNAL( completed() ), this, TQ_SLOT( slotCompleted() ) );
m_part = htmlPart;
} else {
// Try to find an appropriate viewer component
@@ -176,13 +176,13 @@ KParts::ReadOnlyPart* KWebDesktop::createPart( const TQString& mimeType )
kdWarning() << "No handler found for " << mimeType << endl;
else {
kdDebug() << "Loaded " << m_part->className() << endl;
- connect( m_part, TQT_SIGNAL( completed() ),
- this, TQT_SLOT( slotCompleted() ) );
+ connect( m_part, TQ_SIGNAL( completed() ),
+ this, TQ_SLOT( slotCompleted() ) );
}
}
if ( m_part ) {
- connect( m_part, TQT_SIGNAL( canceled(const TQString &) ),
- this, TQT_SLOT( slotCompleted() ) );
+ connect( m_part, TQ_SIGNAL( canceled(const TQString &) ),
+ this, TQ_SLOT( slotCompleted() ) );
}
return m_part;
}
diff --git a/kdesktop/kwebdesktop/kwebdesktop.h b/kdesktop/kwebdesktop/kwebdesktop.h
index 2641378cf..686e40297 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.h
+++ b/kdesktop/kwebdesktop/kwebdesktop.h
@@ -28,7 +28,7 @@ namespace TDEIO { class Job; }
class KWebDesktop : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
KWebDesktop( TQObject* parent, const TQCString & imageFile, int width, int height )
: TQObject( parent ),
@@ -51,9 +51,9 @@ private:
};
-class KWebDesktopRun : public QObject
+class KWebDesktopRun : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
KWebDesktopRun( KWebDesktop* webDesktop, const KURL & url );
~KWebDesktopRun() {}
diff --git a/kdesktop/kwebdesktop/kwebdesktop.kcfg b/kdesktop/kwebdesktop/kwebdesktop.kcfg
index b0920f410..b9a1edbb5 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.kcfg
+++ b/kdesktop/kwebdesktop/kwebdesktop.kcfg
@@ -11,7 +11,7 @@
<default>http://www.kde.org/</default>
<label></label>
<whatsthis></whatsthis>
- <!-- kdiconview.cc:1103 -->
+ <!-- kdiconview.cpp:1103 -->
<!-- cfg.readEntry( "URL" ) == "trash:/" ) { -->
</entry>
</group>
diff --git a/kdesktop/lock/CMakeLists.txt b/kdesktop/lock/CMakeLists.txt
index 05e14e938..8f3e49e16 100644
--- a/kdesktop/lock/CMakeLists.txt
+++ b/kdesktop/lock/CMakeLists.txt
@@ -34,14 +34,14 @@ link_directories(
set( target kdesktop_lock )
set( ${target}_SRCS
- lockprocess.cc lockdlg.cc infodlg.cc querydlg.cc sakdlg.cc
- securedlg.cc autologout.cc main.cc
+ lockprocess.cpp lockdlg.cpp infodlg.cpp querydlg.cpp sakdlg.cpp
+ securedlg.cpp autologout.cpp main.cpp
)
tde_add_executable( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kdesktopsettings-static dmctl-static tdeio-shared Xext
- pthread ${GL_LIBRARIES} ${LIBTDELDAP_LIBRARIES}
+ LINK kdesktopsettings-static dmctl-static tdeio-shared Xext ${TDEHW_LIBRARIES}
+ pthread ${GL_LIBRARIES}
"${LINKER_IMMEDIATE_BINDING_FLAGS}"
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kdesktop/lock/Makefile.am b/kdesktop/lock/Makefile.am
index c686e3ea9..4c2fb22a8 100644
--- a/kdesktop/lock/Makefile.am
+++ b/kdesktop/lock/Makefile.am
@@ -8,7 +8,7 @@ kdesktop_lock_LDADD = ../libkdesktopsettings.la ../../tdmlib/libdmctl.la $(LI
bin_PROGRAMS = kdesktop_lock
-kdesktop_lock_SOURCES = lockprocess.cc lockdlg.cc infodlg.cc querydlg.cc autologout.cc main.cc
+kdesktop_lock_SOURCES = lockprocess.cpp lockdlg.cpp infodlg.cpp querydlg.cpp autologout.cpp main.cpp
noinst_HEADERS = lockprocess.h lockdlg.h infodlg.h querydlg.h autologout.h main.h
diff --git a/kdesktop/lock/autologout.cc b/kdesktop/lock/autologout.cpp
index 6e05c439d..ee1d8e1db 100644
--- a/kdesktop/lock/autologout.cc
+++ b/kdesktop/lock/autologout.cpp
@@ -67,7 +67,7 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog"
unlockDialogLayout->addWidget( frame );
frameLayout = new TQGridLayout(frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint());
- frameLayout->addMultiCellWidget(pixLabel, 0, 2, 0, 0, Qt::AlignCenter | Qt::AlignTop);
+ frameLayout->addMultiCellWidget(pixLabel, 0, 2, 0, 0, TQt::AlignCenter | TQt::AlignTop);
frameLayout->addWidget(greetLabel, 0, 1);
frameLayout->addWidget(mStatusLabel, 1, 1);
frameLayout->addWidget(infoLabel, 2, 1);
@@ -83,7 +83,7 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog"
mCountdownTimerId = startTimer(1000/25);
- connect(tqApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()));
+ connect(tqApp, TQ_SIGNAL(activity()), TQ_SLOT(slotActivity()));
setFixedSize( sizeHint() );
}
@@ -119,7 +119,7 @@ void AutoLogout::slotActivity()
void AutoLogout::logout()
{
- TQT_TQOBJECT(this)->killTimers();
+ this->killTimers();
DCOPRef("ksmserver","ksmserver").send("logout", 0, 0, 0);
}
diff --git a/kdesktop/lock/autologout.h b/kdesktop/lock/autologout.h
index 89cbb880e..834f4fd0e 100644
--- a/kdesktop/lock/autologout.h
+++ b/kdesktop/lock/autologout.h
@@ -22,7 +22,7 @@ class TQProgressBar;
class AutoLogout : public TQDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
AutoLogout(LockProcess *parent);
diff --git a/kdesktop/lock/infodlg.cc b/kdesktop/lock/infodlg.cpp
index 3efaf060d..6fc604b43 100644
--- a/kdesktop/lock/infodlg.cc
+++ b/kdesktop/lock/infodlg.cpp
@@ -97,7 +97,7 @@ InfoDlg::InfoDlg(LockProcess *parent)
layStatus->addWidget( mStatusLabel );
frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
- frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, Qt::AlignTop );
+ frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, TQt::AlignTop );
frameLayout->addLayout( layStatus, 1, 1 );
installEventFilter(this);
@@ -111,7 +111,7 @@ InfoDlg::~InfoDlg()
void InfoDlg::updateLabel(TQString &txt)
{
- mStatusLabel->setPaletteForegroundColor(Qt::black);
+ mStatusLabel->setPaletteForegroundColor(TQt::black);
mStatusLabel->setText("<b>" + txt + "</b>");
}
diff --git a/kdesktop/lock/infodlg.h b/kdesktop/lock/infodlg.h
index 3daf4d2ce..ec5569748 100644
--- a/kdesktop/lock/infodlg.h
+++ b/kdesktop/lock/infodlg.h
@@ -26,7 +26,7 @@ class TQListView;
//
class InfoDlg : public TQDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
InfoDlg(LockProcess *parent);
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cpp
index d4b456a9e..c8d82e8d9 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cpp
@@ -21,6 +21,7 @@
#include <kpushbutton.h>
#include <kseparator.h>
#include <kstandarddirs.h>
+#include <ksimpleconfig.h>
#include <tdeglobalsettings.h>
#include <tdeconfig.h>
#include <kiconloader.h>
@@ -43,7 +44,10 @@
#include <tqlistview.h>
#include <tqheader.h>
#include <tqcheckbox.h>
+#ifdef WITH_TDEHWLIB
#include <tqfile.h>
+#include <tdecryptographiccarddevice.h>
+#endif
#include <ctype.h>
#include <unistd.h>
@@ -58,9 +62,6 @@
#include <X11/Xatom.h>
#include <fixx11h.h>
-#ifdef HAVE_KRB5
-#include <libtdeldap.h>
-#endif
#ifndef AF_LOCAL
# define AF_LOCAL AF_UNIX
@@ -101,6 +102,7 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin, TQDat
mPlugin( plugin ),
mCapsLocked(-1),
mUnlockingFailed(false),
+ validUserCardInserted(false),
showInfoMessages(true),
mCardLoginInProgress(false)
{
@@ -198,7 +200,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin)
if (!m_lockStartDT.isNull()) {
frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
- frameLayout->addMultiCellWidget( theader, 0, 0, 0, 2, Qt::AlignTop );
+ frameLayout->addMultiCellWidget( theader, 0, 0, 0, 2, TQt::AlignTop );
frameLayout->addWidget( greetLabel, 1, 1 );
frameLayout->addWidget( lockDTLabel, 2, 1 );
frameLayout->addItem( greet->getLayoutItem(), 3, 1 );
@@ -208,7 +210,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin)
}
else {
frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
- frameLayout->addMultiCellWidget( theader, 0, 0, 0, 2, Qt::AlignTop );
+ frameLayout->addMultiCellWidget( theader, 0, 0, 0, 2, TQt::AlignTop );
frameLayout->addWidget( greetLabel, 1, 1 );
frameLayout->addItem( greet->getLayoutItem(), 2, 1 );
frameLayout->addLayout( layStatus, 3, 1 );
@@ -218,7 +220,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin)
}
else {
frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
- frameLayout->addMultiCellWidget( pixLabel, 0, 2, 0, 0, Qt::AlignTop );
+ frameLayout->addMultiCellWidget( pixLabel, 0, 2, 0, 0, TQt::AlignTop );
frameLayout->addWidget( greetLabel, 0, 1 );
frameLayout->addItem( greet->getLayoutItem(), 1, 1 );
frameLayout->addLayout( layStatus, 2, 1 );
@@ -235,12 +237,12 @@ void PasswordDlg::init(GreeterPluginHandle *plugin)
}
setTabOrder( mNewSessButton, mLayoutButton );
- connect(mLayoutButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(layoutClicked()));
+ connect(mLayoutButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(layoutClicked()));
if (show_cancel_button) {
- connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
+ connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
}
- connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(slotOK()));
- connect(mNewSessButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSwitchUser()));
+ connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(slotOK()));
+ connect(mNewSessButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotSwitchUser()));
if (!DM().isSwitchable() || !kapp->authorize("switch_user")) {
mNewSessButton->hide();
@@ -251,7 +253,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin)
mFailedTimerId = 0;
mTimeoutTimerId = startTimer(PASSDLG_HIDE_TIMEOUT);
- connect(tqApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()) );
+ connect(tqApp, TQ_SIGNAL(activity()), TQ_SLOT(slotActivity()) );
greet->setInfoMessageDisplay(showInfoMessages);
greet->start();
@@ -327,12 +329,12 @@ void PasswordDlg::setLayoutText( const TQString &txt )
void PasswordDlg::updateLabel()
{
if (mUnlockingFailed) {
- mStatusLabel->setPaletteForegroundColor(Qt::black);
+ mStatusLabel->setPaletteForegroundColor(TQt::black);
mStatusLabel->setText(i18n("<b>Unlocking failed</b>"));
// mStatusLabel->show();
}
else if (mCapsLocked) {
- mStatusLabel->setPaletteForegroundColor(Qt::red);
+ mStatusLabel->setPaletteForegroundColor(TQt::red);
mStatusLabel->setText(i18n("<b>Warning: Caps Lock on</b>"));
// mStatusLabel->show();
}
@@ -479,6 +481,7 @@ void PasswordDlg::reapVerify()
switch (WEXITSTATUS(status)) {
case AuthOk:
{
+#ifdef WITH_TDEHWLIB
KUser userinfo;
TQString fileName = userinfo.homeDir() + "/.tde_card_login_state";
TQFile flagFile(fileName);
@@ -493,6 +496,7 @@ void PasswordDlg::reapVerify()
// Card was not used to log in
flagFile.remove();
}
+#endif
// Signal success
greet->succeeded();
@@ -555,6 +559,7 @@ void PasswordDlg::handleVerify()
setFixedSize( sizeHint().width(), sizeHint().height() + 1 );
setFixedSize( sizeHint() );
+#ifdef WITH_TDEHWLIB
// Check if cryptographic card login is being used
if (mCardLoginInProgress) {
// Attempt authentication if configured
@@ -563,11 +568,12 @@ void PasswordDlg::handleVerify()
TQString autoPIN = cdevice->autoPIN();
if (autoPIN != TQString::null) {
greet->setPassword(autoPIN);
- TQTimer::singleShot(0, this, SLOT(slotOK()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotOK()));
}
}
mCardLoginInProgress = false;
}
+#endif
}
else {
greet->textPrompt( arr, false, false );
@@ -706,12 +712,12 @@ void PasswordDlg::gplugMsgBox( TQMessageBox::Icon type, const TQString &text )
KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame );
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( winFrame, 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 );
static_cast< LockProcess* >(parent())->execDialog( &dialog );
}
@@ -777,16 +783,16 @@ void PasswordDlg::slotStartNewSession()
TQLabel *label2 = new TQLabel( qt_text, winFrame );
KPushButton *okbutton = new KPushButton( KGuiItem(i18n("&Start New Session"), "fork"), winFrame );
okbutton->setDefault( true );
- connect( okbutton, TQT_SIGNAL( clicked() ), dialog, TQT_SLOT( accept() ) );
+ connect( okbutton, TQ_SIGNAL( clicked() ), dialog, TQ_SLOT( accept() ) );
KPushButton *cbutton = new KPushButton( KStdGuiItem::cancel(), winFrame );
- connect( cbutton, TQT_SIGNAL( clicked() ), dialog, TQT_SLOT( reject() ) );
+ connect( cbutton, TQ_SIGNAL( clicked() ), dialog, TQ_SLOT( reject() ) );
TQBoxLayout *mbox = new TQVBoxLayout( winFrame, KDialog::marginHint(), KDialog::spacingHint() );
TQGridLayout *grid = new TQGridLayout( mbox, 2, 2, 2 * KDialog::spacingHint() );
grid->setMargin( KDialog::marginHint() );
- grid->addWidget( label1, 0, 0, Qt::AlignCenter );
- grid->addWidget( label2, 0, 1, Qt::AlignCenter );
+ grid->addWidget( label1, 0, 0, TQt::AlignCenter );
+ grid->addWidget( label2, 0, 1, TQt::AlignCenter );
TQCheckBox *cb = new TQCheckBox( i18n("&Do not ask again"), winFrame );
grid->addMultiCellWidget( cb, 1,1, 0,1 );
@@ -895,8 +901,8 @@ void PasswordDlg::slotSwitchUser()
SessList sess;
if (dm.localSessions( sess )) {
lv = new TQListView( winFrame );
- connect( lv, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), TQT_SLOT(slotSessionActivated()) );
- connect( lv, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), &dialog, TQT_SLOT(accept()) );
+ connect( lv, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), TQ_SLOT(slotSessionActivated()) );
+ connect( lv, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), &dialog, TQ_SLOT(accept()) );
lv->setAllColumnsShowFocus( true );
lv->addColumn( i18n("Session") );
lv->addColumn( i18n("Location") );
@@ -927,16 +933,16 @@ void PasswordDlg::slotSwitchUser()
vbox1->addWidget( lv );
btn = new KPushButton( KGuiItem(i18n("session", "&Activate"), "fork"), winFrame );
- connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotSessionActivated()) );
- connect( btn, TQT_SIGNAL(clicked()), &dialog, TQT_SLOT(accept()) );
+ connect( btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotSessionActivated()) );
+ connect( btn, TQ_SIGNAL(clicked()), &dialog, TQ_SLOT(accept()) );
vbox2->addWidget( btn );
vbox2->addStretch( 2 );
}
if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0) {
btn = new KPushButton( KGuiItem(i18n("Start &New Session"), "fork"), winFrame );
- connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotStartNewSession()) );
- connect( btn, TQT_SIGNAL(clicked()), &dialog, TQT_SLOT(accept()) );
+ connect( btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotStartNewSession()) );
+ connect( btn, TQ_SIGNAL(clicked()), &dialog, TQ_SLOT(accept()) );
if (!p)
btn->setEnabled( false );
vbox2->addWidget( btn );
@@ -944,7 +950,7 @@ void PasswordDlg::slotSwitchUser()
}
btn = new KPushButton( KStdGuiItem::cancel(), winFrame );
- connect( btn, TQT_SIGNAL(clicked()), &dialog, TQT_SLOT(reject()) );
+ connect( btn, TQ_SIGNAL(clicked()), &dialog, TQ_SLOT(reject()) );
vbox2->addWidget( btn );
dialog.setFixedSize( dialog.sizeHint() );
@@ -974,16 +980,22 @@ void PasswordDlg::capsLocked()
}
void PasswordDlg::attemptCardLogin() {
-#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;
+ }
+
if (mCardLoginInProgress) {
return;
}
@@ -1003,10 +1015,12 @@ void PasswordDlg::attemptCardLogin() {
// Bypass initial password prompt
greet->start();
greet->setPassword("");
- TQTimer::singleShot(0, this, SLOT(slotOK()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotOK()));
+#endif
}
void PasswordDlg::resetCardLogin() {
+#ifdef WITH_TDEHWLIB
validUserCardInserted = false;
greet->abort();
greet->clear();
@@ -1019,9 +1033,10 @@ void PasswordDlg::resetCardLogin() {
setFixedSize(sizeHint());
// Restore information message display settings
- greet->setInfoMessageDisplay(showInfoMessages);
+ greet->setInfoMessageDisplay(showInfoMessages);
mCardLoginInProgress = false;
+#endif
}
#include "lockdlg.moc"
diff --git a/kdesktop/lock/lockdlg.h b/kdesktop/lock/lockdlg.h
index 571d825fa..3f8500a42 100644
--- a/kdesktop/lock/lockdlg.h
+++ b/kdesktop/lock/lockdlg.h
@@ -33,7 +33,7 @@ class TQListView;
//
class PasswordDlg : public TQDialog, public KGreeterPluginHandler
{
- Q_OBJECT
+ TQ_OBJECT
public:
PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin);
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cpp
index fdde3fc9e..0a343d88e 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cpp
@@ -17,6 +17,14 @@
//some image will be corrupted).
#include <config.h>
+#include <tdeglobal.h>
+
+#ifdef WITH_TDEHWLIB
+#include <ksslcertificate.h>
+#include <kuser.h>
+#include <tdehardwaredevices.h>
+#include <tdecryptographiccarddevice.h>
+#endif
#include "lockprocess.h"
#include "lockdlg.h"
@@ -34,7 +42,6 @@
#include <tdeapplication.h>
#include <kservicegroup.h>
#include <kdebug.h>
-#include <kuser.h>
#include <tdemessagebox.h>
#include <tdeglobalsettings.h>
#include <tdelocale.h>
@@ -249,7 +256,7 @@ LockProcess::LockProcess()
if (!argb_visual) {
// Try to get the root pixmap
if (!m_rootPixmap) m_rootPixmap = new KRootPixmap(this);
- connect(m_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQT_SLOT(slotPaintBackground(const TQPixmap &)));
+ connect(m_rootPixmap, TQ_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQ_SLOT(slotPaintBackground(const TQPixmap &)));
m_rootPixmap->setCustomPainting(true);
m_rootPixmap->start();
}
@@ -291,18 +298,20 @@ LockProcess::LockProcess()
}
}
+#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, SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*)));
- 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(pinRequested(TQString,TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardPinRequested(TQString,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);
// cdevice->enablePINEntryCallbacks(true);
}
+#endif
#ifdef KEEP_MOUSE_UNGRABBED
setEnabled(false);
@@ -379,12 +388,12 @@ void LockProcess::init(bool child, bool useBlankOnly)
generateBackingImages();
// Connect all signals
- connect( mForceContinualLockDisplayTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(displayLockDialogIfNeeded()) );
- connect( mHackDelayStartupTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(closeDialogAndStartHack()) );
- connect( mEnsureVRootWindowSecurityTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(repaintRootWindowIfNeeded()) );
- connect(tqApp, TQT_SIGNAL(mouseInteraction(XEvent *)), TQT_SLOT(slotMouseActivity(XEvent *)));
- connect(&mHackProc, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(hackExited(TDEProcess *)));
- connect(&mSuspendTimer, TQT_SIGNAL(timeout()), TQT_SLOT(suspend()));
+ connect( mForceContinualLockDisplayTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(displayLockDialogIfNeeded()) );
+ connect( mHackDelayStartupTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(closeDialogAndStartHack()) );
+ connect( mEnsureVRootWindowSecurityTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(repaintRootWindowIfNeeded()) );
+ connect(tqApp, TQ_SIGNAL(mouseInteraction(XEvent *)), TQ_SLOT(slotMouseActivity(XEvent *)));
+ connect(&mHackProc, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(hackExited(TDEProcess *)));
+ connect(&mSuspendTimer, TQ_SIGNAL(timeout()), TQ_SLOT(suspend()));
#ifdef HAVE_DPMS
//if the user decided that the screensaver should run independent from
@@ -394,7 +403,7 @@ void LockProcess::init(bool child, bool useBlankOnly)
CARD16 state;
if (DPMSInfo(tqt_xdisplay(), &state, &on)) {
if (on) {
- connect(&mCheckDPMS, TQT_SIGNAL(timeout()), TQT_SLOT(checkDPMSActive()));
+ connect(&mCheckDPMS, TQ_SIGNAL(timeout()), TQ_SLOT(checkDPMSActive()));
// we can save CPU if we stop it as quickly as possible
// but we waste CPU if we check too often -> so take 10s
mCheckDPMS.start(10000);
@@ -404,7 +413,7 @@ void LockProcess::init(bool child, bool useBlankOnly)
#endif
#if (TQT_VERSION-0 >= 0x030200) // XRANDR support
- connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized()));
+ connect( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized()));
#endif
if (!trinity_desktop_lock_use_system_modal_dialogs) {
@@ -426,8 +435,8 @@ void LockProcess::init(bool child, bool useBlankOnly)
mControlPipeHandler = new ControlPipeHandlerObject();
mControlPipeHandler->mParent = 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();
}
@@ -524,8 +533,8 @@ void LockProcess::setupSignals()
if (pipe(signal_pipe) == -1) {
// Error handler to shut up gcc warnings
}
- TQSocketNotifier* notif = new TQSocketNotifier(signal_pipe[0], TQSocketNotifier::Read, TQT_TQOBJECT(this) );
- connect( notif, TQT_SIGNAL(activated(int)), TQT_SLOT(signalPipeSignal()));
+ TQSocketNotifier* notif = new TQSocketNotifier(signal_pipe[0], TQSocketNotifier::Read, this );
+ connect( notif, TQ_SIGNAL(activated(int)), TQ_SLOT(signalPipeSignal()));
}
@@ -568,7 +577,7 @@ bool LockProcess::lock()
// selecting "lock screen", that looks really untidy.
mBusy = true;
if (startLock()) {
- TQTimer::singleShot(1000, this, TQT_SLOT(slotDeadTimePassed()));
+ TQTimer::singleShot(1000, this, TQ_SLOT(slotDeadTimePassed()));
return true;
}
stopSaver();
@@ -589,7 +598,7 @@ bool LockProcess::defaultSave()
mOverrideHackStartupEnabled = true;
if (startSaver()) {
if (mLockGrace >= 0) {
- TQTimer::singleShot(mLockGrace, this, TQT_SLOT(startLock()));
+ TQTimer::singleShot(mLockGrace, this, TQ_SLOT(startLock()));
}
return true;
}
@@ -609,7 +618,7 @@ void LockProcess::quitSaver()
{
DISABLE_CONTINUOUS_LOCKDLG_DISPLAY
if (closeCurrentWindow()) {
- TQTimer::singleShot( 0, this, SLOT(quitSaver()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(quitSaver()) );
return;
}
stopSaver();
@@ -620,7 +629,7 @@ void LockProcess::quitSaver()
void LockProcess::startSecureDialog()
{
if ((backingPixmap.isNull()) && (mBackingStartupDelayTimer < 100)) {
- TQTimer::singleShot(10, this, TQT_SLOT(startSecureDialog()));
+ TQTimer::singleShot(10, this, TQ_SLOT(startSecureDialog()));
mBackingStartupDelayTimer++;
return;
}
@@ -652,14 +661,14 @@ void LockProcess::startSecureDialog()
mBusy = true;
trinity_desktop_lock_forced = true;
// Make sure the cursor is not showing busy status
- setCursor( tqarrowCursor );
+ setCursor( TQt::arrowCursor );
if (startLock())
{
if (trinity_desktop_lock_delay_screensaver_start) {
mBusy = false;
}
else {
- TQTimer::singleShot(1000, this, TQT_SLOT(slotDeadTimePassed()));
+ TQTimer::singleShot(1000, this, TQ_SLOT(slotDeadTimePassed()));
}
if (trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced && trinity_desktop_lock_use_system_modal_dialogs) {
ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
@@ -719,7 +728,7 @@ bool LockProcess::runSecureDialog()
mInSecureDialog = true;
if (startSaver()) {
mBackingStartupDelayTimer = 0;
- TQTimer::singleShot(0, this, TQT_SLOT(startSecureDialog()));
+ TQTimer::singleShot(0, this, TQ_SLOT(startSecureDialog()));
return true;
}
else {
@@ -1031,7 +1040,7 @@ void LockProcess::desktopResized()
}
else {
mEnsureScreenHiddenTimer = new TQTimer( this );
- connect( mEnsureScreenHiddenTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotForcePaintBackground()) );
+ connect( mEnsureScreenHiddenTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotForcePaintBackground()) );
}
mEnsureScreenHiddenTimer->start(DESKTOP_WALLPAPER_OBTAIN_TIMEOUT_MS, true);
}
@@ -1054,7 +1063,7 @@ void LockProcess::desktopResized()
// being displayed, so we finish the hack restarting/display prettying operations in a separate timed slot
if (resizeTimer == NULL) {
resizeTimer = new TQTimer( this );
- connect( resizeTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doDesktopResizeFinish()) );
+ connect( resizeTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doDesktopResizeFinish()) );
}
resizeTimer->start( 100, TRUE ); // 100 millisecond single shot timer; should allow display switching operations to finish before hack is started
}
@@ -1066,7 +1075,7 @@ void LockProcess::doDesktopResizeFinish()
}
mDialogControlLock = true;
if (closeCurrentWindow()) {
- TQTimer::singleShot( 0, this, SLOT(doDesktopResizeFinish()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(doDesktopResizeFinish()) );
mDialogControlLock = false;
return;
}
@@ -1234,10 +1243,10 @@ bool LockProcess::grabMouse()
{
HANDLE cursorHandle;
if (mHackActive) {
- cursorHandle = TQCursor(tqblankCursor).handle();
+ cursorHandle = TQCursor(TQt::blankCursor).handle();
}
else {
- cursorHandle = TQCursor(tqbusyCursor).handle();
+ cursorHandle = TQCursor(TQt::busyCursor).handle();
}
int rv = XGrabPointer( tqt_xdisplay(), TQApplication::desktop()->winId(),
True, GRABEVENTS, GrabModeAsync, GrabModeAsync, None,
@@ -1344,8 +1353,8 @@ bool LockProcess::startSaver(bool notify_ready)
saveVRoot();
if (mParent) {
- TQSocketNotifier *notifier = new TQSocketNotifier(mParent, TQSocketNotifier::Read, TQT_TQOBJECT(this), "notifier");
- connect(notifier, TQT_SIGNAL( activated (int)), TQT_SLOT( quitSaver()));
+ TQSocketNotifier *notifier = new TQSocketNotifier(mParent, TQSocketNotifier::Read, this, "notifier");
+ connect(notifier, TQ_SIGNAL( activated (int)), TQ_SLOT( quitSaver()));
}
createSaverWindow();
move(0, 0);
@@ -1533,7 +1542,7 @@ void LockProcess::closeDialogAndStartHack()
DISABLE_CONTINUOUS_LOCKDLG_DISPLAY
mSuspended = true;
if (closeCurrentWindow()) {
- TQTimer::singleShot( 0, this, SLOT(closeDialogAndStartHack()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(closeDialogAndStartHack()) );
}
else {
resume(true);
@@ -1593,8 +1602,8 @@ bool LockProcess::startHack()
return false;
}
- setCursor( tqblankCursor );
- XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(tqblankCursor).handle(), CurrentTime);
+ setCursor( TQt::blankCursor );
+ XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(TQt::blankCursor).handle(), CurrentTime);
if (mSaverExec.isEmpty()) {
return false;
@@ -1650,7 +1659,7 @@ bool LockProcess::startHack()
mSuspended = false;
}
- XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(tqblankCursor).handle(), CurrentTime);
+ XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(TQt::blankCursor).handle(), CurrentTime);
if (mHackProc.start() == true) {
#ifdef HAVE_SETPRIORITY
setpriority(PRIO_PROCESS, mHackProc.pid(), mPriority);
@@ -1660,7 +1669,7 @@ bool LockProcess::startHack()
if (trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced) {
// Close any active dialogs
if (closeCurrentWindow()) {
- TQTimer::singleShot( 0, this, SLOT(closeCurrentWindow()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(closeCurrentWindow()) );
}
}
if (m_startupStatusDialog) { m_startupStatusDialog->closeSMDialog(); m_startupStatusDialog=NULL; }
@@ -1724,7 +1733,7 @@ void LockProcess::stopHack()
mHackProc.kill(SIGKILL);
}
}
- setCursor( tqarrowCursor );
+ setCursor( TQt::arrowCursor );
mHackActive = FALSE;
}
@@ -1980,7 +1989,7 @@ int LockProcess::execDialog( TQDialog *dlg )
if (mDialogs.isEmpty()) {
suspend();
- XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(tqarrowCursor).handle(), CurrentTime);
+ XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(TQt::arrowCursor).handle(), CurrentTime);
}
mDialogs.prepend( dlg );
fakeFocusIn( dlg->winId());
@@ -2007,17 +2016,17 @@ int LockProcess::execDialog( TQDialog *dlg )
if( mDialogs.isEmpty() ) {
HANDLE cursorHandle;
if (mHackActive) {
- cursorHandle = TQCursor(tqblankCursor).handle();
+ cursorHandle = TQCursor(TQt::blankCursor).handle();
}
else {
- cursorHandle = TQCursor(tqbusyCursor).handle();
+ cursorHandle = TQCursor(TQt::busyCursor).handle();
}
XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, cursorHandle, CurrentTime);
if (trinity_desktop_lock_use_system_modal_dialogs) {
// Slight delay before screensaver resume to allow the dialog window to fully disappear
if (hackResumeTimer == NULL) {
hackResumeTimer = new TQTimer( this );
- connect( hackResumeTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(resumeUnforced()) );
+ connect( hackResumeTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(resumeUnforced()) );
}
if (mResizingDesktopLock == false) {
hackResumeTimer->start( 10, TRUE );
@@ -2037,7 +2046,7 @@ int LockProcess::execDialog( TQDialog *dlg )
void LockProcess::slotForcePaintBackground()
{
TQPixmap blankPixmap(mRootWidth, mRootHeight);
- blankPixmap.fill(Qt::black);
+ blankPixmap.fill(TQt::black);
slotPaintBackground(blankPixmap);
printf("[WARNING] Unable to obtain desktop wallpaper in a timely manner. High system load or possibly a TDE bug!\n"); fflush(stdout);
}
@@ -2056,7 +2065,7 @@ void LockProcess::slotPaintBackground(const TQPixmap &rpm)
}
else {
mEnsureScreenHiddenTimer = new TQTimer( this );
- connect( mEnsureScreenHiddenTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotForcePaintBackground()) );
+ connect( mEnsureScreenHiddenTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotForcePaintBackground()) );
}
// Only remove the mask widget once the resize is 100% complete!
@@ -2118,7 +2127,7 @@ void LockProcess::doFunctionKeyBroadcast() {
// This does NOT work with the SAK or system modal dialogs!
if ((!trinity_desktop_lock_use_system_modal_dialogs) && (!trinity_desktop_lock_use_sak)) {
mBusy=true;
- TQTimer::singleShot(1000, this, TQT_SLOT(slotDeadTimePassed()));
+ TQTimer::singleShot(1000, this, TQ_SLOT(slotDeadTimePassed()));
if (mkeyCode == XKeysymToKeycode(tqt_xdisplay(), XF86XK_Display)) {
while (mDialogControlLock == true) {
usleep(100000);
@@ -2158,7 +2167,7 @@ bool LockProcess::x11Event(XEvent *event)
(event->xkey.keycode == XKeysymToKeycode(event->xkey.display, XF86XK_AudioRaiseVolume)) || \
(event->xkey.keycode == XKeysymToKeycode(event->xkey.display, XF86XK_AudioLowerVolume))) {
mkeyCode = event->xkey.keycode;
- TQTimer::singleShot( 100, this, TQT_SLOT(doFunctionKeyBroadcast()) );
+ TQTimer::singleShot( 100, this, TQ_SLOT(doFunctionKeyBroadcast()) );
return true;
}
// ACPI power keys
@@ -2167,7 +2176,7 @@ bool LockProcess::x11Event(XEvent *event)
(event->xkey.keycode == XKeysymToKeycode(event->xkey.display, XF86XK_Suspend)) || \
(event->xkey.keycode == XKeysymToKeycode(event->xkey.display, XF86XK_Hibernate))) {
mkeyCode = event->xkey.keycode;
- TQTimer::singleShot( 100, this, TQT_SLOT(doFunctionKeyBroadcast()) );
+ TQTimer::singleShot( 100, this, TQ_SLOT(doFunctionKeyBroadcast()) );
return true;
}
}
@@ -2433,14 +2442,14 @@ void LockProcess::msgBox( TQMessageBox::Icon type, const TQString &txt )
KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame );
button->setDefault( true );
button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
- connect( button, TQT_SIGNAL( clicked() ), &box, TQT_SLOT( accept() ) );
+ connect( button, TQ_SIGNAL( clicked() ), &box, TQ_SLOT( accept() ) );
TQVBoxLayout *vbox = new TQVBoxLayout( &box );
vbox->addWidget( winFrame );
TQGridLayout *grid = new TQGridLayout( winFrame, 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 );
execDialog( &box );
}
@@ -2449,19 +2458,13 @@ static int run_vkbd = -1;
void LockProcess::showVkbd()
{
if( run_vkbd == - 1 ) {
-#ifdef WITH_HAL
- int status = system( "hal-find-by-property --key system.formfactor.subtype --string tabletpc" );
-// status = 0; // enable for testing
- run_vkbd = ( WIFEXITED( status ) && WEXITSTATUS( status ) == 0 && !TDEStandardDirs::findExe( "xvkbd" ).isEmpty()) ? 1 : 0;
-#else // WITH_HAL
run_vkbd = (!TDEStandardDirs::findExe( "xvkbd" ).isEmpty());
-#endif // WITH_HAL
}
if( run_vkbd ) {
mVkbdWindows.clear();
mVkbdLastEventWindow = None;
mKWinModule = new KWinModule( NULL, KWinModule::INFO_WINDOWS );
- connect( mKWinModule, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( windowAdded( WId )));
+ connect( mKWinModule, TQ_SIGNAL( windowAdded( WId )), TQ_SLOT( windowAdded( WId )));
mVkbdProcess = new TDEProcess;
*mVkbdProcess << "xvkbd" << "-compact" << "-geometry" << "-0-0" << "-xdm";
mVkbdProcess->start();
@@ -2567,7 +2570,7 @@ bool LockProcess::forwardVkbdEvent( XEvent* event )
}
// vkbd windows are kept topmost, so just find the first one in the position
for( TQValueList< VkbdWindow >::ConstIterator it = mVkbdWindows.begin(); it != mVkbdWindows.end(); ++it ) {
- if( TQT_TQRECT_OBJECT((*it).rect).contains( pos )) {
+ if( (*it).rect.contains( pos )) {
// Find the subwindow where the event should actually go.
// Not exactly cheap in the number of X roundtrips but oh well.
Window window = (*it).id;
@@ -2692,7 +2695,7 @@ void LockProcess::slotMouseActivity(XEvent *event)
m_dialogPrevY = oldPoint.y();
m_mousePrevX = be->x_root;
m_mousePrevY = be->y_root;
- XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(tqsizeAllCursor).handle(), CurrentTime);
+ XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(TQt::sizeAllCursor).handle(), CurrentTime);
}
}
@@ -2712,7 +2715,7 @@ void LockProcess::slotMouseActivity(XEvent *event)
if (event->type == ButtonRelease) {
m_mouseDown = 0;
- XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(tqarrowCursor).handle(), CurrentTime);
+ XChangeActivePointerGrab( tqt_xdisplay(), GRABEVENTS, TQCursor(TQt::arrowCursor).handle(), CurrentTime);
}
}
@@ -2823,6 +2826,7 @@ void LockProcess::processInputPipeCommand(TQString inputcommand) {
}
void LockProcess::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
+#ifdef WITH_TDEHWLIB
TQString login_name = TQString::null;
X509CertificatePtrList certList = cdevice->cardX509Certificates();
if (certList.count() > 0) {
@@ -2845,31 +2849,36 @@ void LockProcess::cryptographicCardInserted(TDECryptographicCardDevice* cdevice)
m_loginCardDevice = cdevice;
if (dynamic_cast<SAKDlg*>(currentDialog)) {
dynamic_cast<SAKDlg*>(currentDialog)->closeDialogForced();
- TQTimer::singleShot(0, this, SLOT(signalPassDlgToAttemptCardLogin()));
+ TQTimer::singleShot(0, this, TQ_SLOT(signalPassDlgToAttemptCardLogin()));
}
else if (dynamic_cast<SecureDlg*>(currentDialog)) {
dynamic_cast<SecureDlg*>(currentDialog)->closeDialogForced();
- TQTimer::singleShot(0, this, SLOT(signalPassDlgToAttemptCardLogin()));
+ TQTimer::singleShot(0, this, TQ_SLOT(signalPassDlgToAttemptCardLogin()));
}
else if (dynamic_cast<PasswordDlg*>(currentDialog)) {
signalPassDlgToAttemptCardLogin();
}
}
}
+#endif
}
void LockProcess::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) {
+#ifdef WITH_TDEHWLIB
PasswordDlg* passDlg = dynamic_cast<PasswordDlg*>(currentDialog);
if (passDlg) {
passDlg->resetCardLogin();
}
else {
m_loginCardDevice = NULL;
- TQTimer::singleShot(0, this, SLOT(signalPassDlgToAttemptCardAbort()));
+ TQTimer::singleShot(0, this, TQ_SLOT(signalPassDlgToAttemptCardAbort()));
}
+#endif
}
-void LockProcess::signalPassDlgToAttemptCardLogin() {
+void LockProcess::signalPassDlgToAttemptCardLogin()
+{
+#ifdef WITH_TDEHWLIB
PasswordDlg* passDlg = dynamic_cast<PasswordDlg*>(currentDialog);
if (passDlg && m_loginCardDevice) {
passDlg->attemptCardLogin();
@@ -2877,12 +2886,15 @@ void LockProcess::signalPassDlgToAttemptCardLogin() {
else {
if (currentDialog && m_loginCardDevice) {
// Try again later
- TQTimer::singleShot(0, this, SLOT(signalPassDlgToAttemptCardLogin()));
+ TQTimer::singleShot(0, this, TQ_SLOT(signalPassDlgToAttemptCardLogin()));
}
}
+#endif
}
-void LockProcess::signalPassDlgToAttemptCardAbort() {
+void LockProcess::signalPassDlgToAttemptCardAbort()
+{
+#ifdef WITH_TDEHWLIB
PasswordDlg* passDlg = dynamic_cast<PasswordDlg*>(currentDialog);
if (passDlg) {
passDlg->resetCardLogin();
@@ -2890,12 +2902,15 @@ void LockProcess::signalPassDlgToAttemptCardAbort() {
else {
if (currentDialog) {
// Try again later
- TQTimer::singleShot(0, this, SLOT(signalPassDlgToAttemptCardAbort()));
+ TQTimer::singleShot(0, this, TQ_SLOT(signalPassDlgToAttemptCardAbort()));
}
}
+#endif
}
-void LockProcess::cryptographicCardPinRequested(TQString prompt, TDECryptographicCardDevice* cdevice) {
+void LockProcess::cryptographicCardPinRequested(TQString prompt, TDECryptographicCardDevice* cdevice)
+{
+#ifdef WITH_TDEHWLIB
TQCString password;
TQString pin_entry;
@@ -2911,10 +2926,16 @@ void LockProcess::cryptographicCardPinRequested(TQString prompt, TDECryptographi
else {
cdevice->setProvidedPin(TQString::null);
}
+#endif
}
-TDECryptographicCardDevice* LockProcess::cryptographicCardDevice() {
+TDECryptographicCardDevice* LockProcess::cryptographicCardDevice()
+{
+#ifdef WITH_TDEHWLIB
return m_loginCardDevice;
+#else
+ return NULL;
+#endif
}
void LockProcess::fullyOnline() {
diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h
index 4dc2d8bab..bfe1fe420 100644
--- a/kdesktop/lock/lockprocess.h
+++ b/kdesktop/lock/lockprocess.h
@@ -10,13 +10,7 @@
#ifndef __LOCKENG_H__
#define __LOCKENG_H__
-#include <ksslcertificate.h>
-
-#include <tdehardwaredevices.h>
-#include <tdecryptographiccarddevice.h>
-
#include <kgreeterplugin.h>
-
#include <kprocess.h>
#include <kpixmap.h>
#include <krootpixmap.h>
@@ -35,6 +29,11 @@ class KLibrary;
class KWinModule;
class KSMModalDialog;
class LockProcess;
+#ifdef WITH_TDEHWLIB
+class TDECryptographicCardDevice;
+#else
+#define TDECryptographicCardDevice void
+#endif
struct GreeterPluginHandle {
KLibrary *library;
@@ -53,7 +52,7 @@ typedef TQValueList<Window> TQXLibWindowList;
//
class ControlPipeHandlerObject : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
ControlPipeHandlerObject();
@@ -82,7 +81,7 @@ class ControlPipeHandlerObject : public TQObject
//
class LockProcess : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
LockProcess();
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cpp
index f1407070c..f80f406a1 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cpp
@@ -40,7 +40,7 @@
#include <stdlib.h>
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
+#if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
#define COMPOSITE
#endif
diff --git a/kdesktop/lock/main.h b/kdesktop/lock/main.h
index fd19c6183..162542555 100644
--- a/kdesktop/lock/main.h
+++ b/kdesktop/lock/main.h
@@ -25,10 +25,10 @@
#include <time.h>
class MyApp : public TDEApplication {
- Q_OBJECT
+ TQ_OBJECT
public:
MyApp() : TDEApplication(), lastTick( 0 ) {}
- MyApp(Display *display, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0, bool allowStyles=true) : TDEApplication(display, visual, colormap, allowStyles), lastTick( 0 ) {}
+ MyApp(Display *display, TQt::HANDLE visual = 0, TQt::HANDLE colormap = 0, bool allowStyles=true) : TDEApplication(display, visual, colormap, allowStyles), lastTick( 0 ) {}
protected:
bool x11EventFilter( XEvent * );
diff --git a/kdesktop/lock/querydlg.cc b/kdesktop/lock/querydlg.cpp
index 1fc5d260c..edab1fd97 100644
--- a/kdesktop/lock/querydlg.cc
+++ b/kdesktop/lock/querydlg.cpp
@@ -111,13 +111,13 @@ QueryDlg::QueryDlg(LockProcess *parent)
layButtons->addWidget( ok );
frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
- frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, Qt::AlignTop );
+ frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, TQt::AlignTop );
frameLayout->addLayout( layStatus, 0, 1 );
frameLayout->addLayout( layPin, 2, 1 );
frameLayout->addMultiCellWidget( sep, 3, 3, 0, 1 );
frameLayout->addMultiCellLayout( layButtons, 4, 4, 0, 1 );
- connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(slotOK()));
+ connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(slotOK()));
installEventFilter(this);
setFixedSize( sizeHint() );
@@ -140,7 +140,7 @@ TQString QueryDlg::getEntry()
void QueryDlg::updateLabel(TQString &txt)
{
- mStatusLabel->setPaletteForegroundColor(Qt::black);
+ mStatusLabel->setPaletteForegroundColor(TQt::black);
mStatusLabel->setText("<b>" + txt + "</b>");
}
diff --git a/kdesktop/lock/querydlg.h b/kdesktop/lock/querydlg.h
index d5c4f7f33..0b3e55aa8 100644
--- a/kdesktop/lock/querydlg.h
+++ b/kdesktop/lock/querydlg.h
@@ -28,7 +28,7 @@ class TQListView;
//
class QueryDlg : public TQDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
QueryDlg(LockProcess *parent);
diff --git a/kdesktop/lock/sakdlg.cc b/kdesktop/lock/sakdlg.cpp
index 803c77919..a9bb25f40 100644
--- a/kdesktop/lock/sakdlg.cc
+++ b/kdesktop/lock/sakdlg.cpp
@@ -108,7 +108,7 @@ SAKDlg::SAKDlg(LockProcess *parent)
mSAKProcess = new TDEProcess;
*mSAKProcess << "tdmtsak";
- connect(mSAKProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
+ connect(mSAKProcess, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotSAKProcessExited()));
mSAKProcess->start();
}
@@ -142,7 +142,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/kdesktop/lock/sakdlg.h b/kdesktop/lock/sakdlg.h
index faded4b6e..12d80b8cb 100644
--- a/kdesktop/lock/sakdlg.h
+++ b/kdesktop/lock/sakdlg.h
@@ -26,7 +26,7 @@ class TQListView;
//
class SAKDlg : public TQDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
SAKDlg(LockProcess *parent);
diff --git a/kdesktop/lock/securedlg.cc b/kdesktop/lock/securedlg.cpp
index fca79a707..5be274660 100644
--- a/kdesktop/lock/securedlg.cc
+++ b/kdesktop/lock/securedlg.cpp
@@ -137,11 +137,11 @@ SecureDlg::SecureDlg(LockProcess *parent)
frameLayout->addMultiCellWidget( sep, 2, 2, 0, 1 );
frameLayout->addMultiCellLayout( layPBGrid, 3, 3, 0, 1, AlignLeft | AlignVCenter);
- connect(mCancelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnCancel()));
- connect(mLockButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnLock()));
- connect(mTaskButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnTask()));
- connect(mShutdownButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnShutdown()));
- connect(mSwitchButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnSwitchUser()));
+ connect(mCancelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBtnCancel()));
+ connect(mLockButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBtnLock()));
+ connect(mTaskButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBtnTask()));
+ connect(mShutdownButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBtnShutdown()));
+ connect(mSwitchButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBtnSwitchUser()));
TQSize dlgSz = sizeHint();
int btnSize = dlgSz.width();
diff --git a/kdesktop/lock/securedlg.h b/kdesktop/lock/securedlg.h
index 9ad0ac1da..c6c9fa7fe 100644
--- a/kdesktop/lock/securedlg.h
+++ b/kdesktop/lock/securedlg.h
@@ -27,7 +27,7 @@ class TQListView;
//
class SecureDlg : public TQDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
SecureDlg(LockProcess *parent);
diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cpp
index f02e51440..e121daaa1 100644
--- a/kdesktop/lockeng.cc
+++ b/kdesktop/lockeng.cpp
@@ -11,18 +11,20 @@
#include <stdlib.h>
#include <sys/stat.h>
+#include <tdeglobal.h>
+#ifdef WITH_TDEHWLIB
#include <ksslcertificate.h>
-
+#include <kuser.h>
#include <tdehardwaredevices.h>
#include <tdecryptographiccarddevice.h>
+#endif
#include <kstandarddirs.h>
#include <tdeapplication.h>
#include <kservicegroup.h>
#include <ksimpleconfig.h>
#include <kdebug.h>
-#include <kuser.h>
#include <tdelocale.h>
#include <tqfile.h>
#include <tqtimer.h>
@@ -132,12 +134,12 @@ SaverEngine::SaverEngine()
m_helperThread->start();
m_threadHelperObject = new SaverEngineThreadHelperObject;
m_threadHelperObject->moveToThread(m_helperThread);
- connect(this, TQT_SIGNAL(terminateHelperThread()), m_threadHelperObject, TQT_SLOT(terminateThread()));
- connect(m_threadHelperObject, TQT_SIGNAL(lockProcessWaiting()), this, TQT_SLOT(lockProcessWaiting()));
- connect(m_threadHelperObject, TQT_SIGNAL(lockProcessFullyActivated()), this, TQT_SLOT(lockProcessFullyActivated()));
+ connect(this, TQ_SIGNAL(terminateHelperThread()), m_threadHelperObject, TQ_SLOT(terminateThread()));
+ connect(m_threadHelperObject, TQ_SIGNAL(lockProcessWaiting()), this, TQ_SLOT(lockProcessWaiting()));
+ connect(m_threadHelperObject, TQ_SIGNAL(lockProcessFullyActivated()), this, TQ_SLOT(lockProcessFullyActivated()));
- connect(&mLockProcess, TQT_SIGNAL(processExited(TDEProcess *)),
- TQT_SLOT(lockProcessExited()));
+ connect(&mLockProcess, TQ_SIGNAL(processExited(TDEProcess *)),
+ TQ_SLOT(lockProcessExited()));
configure();
@@ -158,8 +160,8 @@ SaverEngine::SaverEngine()
if (useSAKProcess) {
mSAKProcess = new TDEProcess;
*mSAKProcess << "tdmtsak";
- connect(mSAKProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
- TQTimer::singleShot( 0, this, TQT_SLOT(handleSecureDialog()) );
+ connect(mSAKProcess, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotSAKProcessExited()));
+ TQTimer::singleShot( 0, this, TQ_SLOT(handleSecureDialog()) );
}
mLockProcess.clearArguments();
@@ -198,14 +200,15 @@ SaverEngine::SaverEngine()
delete config;
config = 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);
}
@@ -217,10 +220,11 @@ SaverEngine::SaverEngine()
TQTextStream stream(&flagFile);
if (stream.readLine().startsWith("1")) {
// Card was likely used to log in
- TQTimer::singleShot(5000, this, SLOT(cardStartupTimeout()));
+ TQTimer::singleShot(5000, this, TQ_SLOT(cardStartupTimeout()));
}
flagFile.close();
}
+#endif
dBusConnect();
}
@@ -261,6 +265,7 @@ void SaverEngine::cardStartupTimeout() {
}
void SaverEngine::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
+#ifdef WITH_TDEHWLIB
TQString login_name = TQString::null;
X509CertificatePtrList certList = cdevice->cardX509Certificates();
if (certList.count() > 0) {
@@ -282,9 +287,11 @@ void SaverEngine::cryptographicCardInserted(TDECryptographicCardDevice* cdevice)
mValidCryptoCardInserted = true;
}
}
+#endif
}
void SaverEngine::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) {
+#ifdef WITH_TDEHWLIB
if (mValidCryptoCardInserted) {
mValidCryptoCardInserted = false;
@@ -294,6 +301,7 @@ void SaverEngine::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice)
// Force lock
lockScreen();
}
+#endif
}
//---------------------------------------------------------------------------
@@ -401,7 +409,7 @@ bool SaverEngine::enable( bool e )
if (mEnabled) {
if ( !mXAutoLock ) {
mXAutoLock = new XAutoLock();
- connect(mXAutoLock, TQT_SIGNAL(timeout()), TQT_SLOT(idleTimeout()));
+ connect(mXAutoLock, TQ_SIGNAL(timeout()), TQ_SLOT(idleTimeout()));
}
mXAutoLock->setTimeout(mTimeout);
mXAutoLock->setDPMS(true);
@@ -437,7 +445,7 @@ bool SaverEngine::isBlanked()
void SaverEngine::enableExports()
{
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
kdDebug(270) << k_lineinfo << "activating background exports.\n";
DCOPClient *client = kapp->dcopClient();
if (!client->isAttached()) {
@@ -694,7 +702,7 @@ void SaverEngine::lockProcessExited()
// PROBABLE HACKING ATTEMPT DETECTED
restartDesktopLockProcess();
mState = Waiting;
- TQTimer::singleShot( 100, this, SLOT(recoverFromHackingAttempt()) );
+ TQTimer::singleShot( 100, this, TQ_SLOT(recoverFromHackingAttempt()) );
}
else {
// Restart the lock process
@@ -841,19 +849,19 @@ bool SaverEngine::dBusConnect() {
dBusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus, DBUS_CONN_NAME);
if( !dBusConn.isConnected() ) {
kdError() << "Failed to open connection to system message bus: " << dBusConn.lastError().message() << endl;
- TQTimer::singleShot(4000, this, TQT_SLOT(dBusReconnect()));
+ TQTimer::singleShot(4000, this, TQ_SLOT(dBusReconnect()));
return false;
}
// watcher for Disconnect signal
dBusLocal = new TQT_DBusProxy(DBUS_SERVICE_DBUS, DBUS_PATH_LOCAL, DBUS_INTERFACE_LOCAL, dBusConn);
- TQObject::connect(dBusLocal, TQT_SIGNAL(dbusSignal(const TQT_DBusMessage&)),
- this, TQT_SLOT(handleDBusSignal(const TQT_DBusMessage&)));
+ TQObject::connect(dBusLocal, TQ_SIGNAL(dbusSignal(const TQT_DBusMessage&)),
+ this, TQ_SLOT(handleDBusSignal(const TQT_DBusMessage&)));
// watcher for NameOwnerChanged signals
dBusWatch = new TQT_DBusProxy(DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, dBusConn);
- TQObject::connect(dBusWatch, TQT_SIGNAL(dbusSignal(const TQT_DBusMessage&)),
- this, TQT_SLOT(handleDBusSignal(const TQT_DBusMessage&)));
+ TQObject::connect(dBusWatch, TQ_SIGNAL(dbusSignal(const TQT_DBusMessage&)),
+ this, TQ_SLOT(handleDBusSignal(const TQT_DBusMessage&)));
// find already running SystemD
TQT_DBusProxy checkSystemD(DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, dBusConn);
@@ -887,8 +895,8 @@ void SaverEngine::onDBusServiceRegistered(const TQString& service) {
// wather for systemd session signals
if( systemdSessionPath.isValid() ) {
systemdSession = new TQT_DBusProxy(SYSTEMD_LOGIN1_SERVICE, systemdSessionPath, SYSTEMD_LOGIN1_SESSION_IFACE, dBusConn);
- TQObject::connect(systemdSession, TQT_SIGNAL(dbusSignal(const TQT_DBusMessage&)),
- this, TQT_SLOT(handleDBusSignal(const TQT_DBusMessage&)));
+ TQObject::connect(systemdSession, TQ_SIGNAL(dbusSignal(const TQT_DBusMessage&)),
+ this, TQ_SLOT(handleDBusSignal(const TQT_DBusMessage&)));
}
return;
}
@@ -916,7 +924,7 @@ void SaverEngine::handleDBusSignal(const TQT_DBusMessage& msg) {
&& msg.interface() == DBUS_INTERFACE_LOCAL
&& msg.member() == "Disconnected" ) {
dBusClose();
- TQTimer::singleShot(1000, this, TQT_SLOT(dBusReconnect()));
+ TQTimer::singleShot(1000, this, TQ_SLOT(dBusReconnect()));
return;
}
diff --git a/kdesktop/lockeng.h b/kdesktop/lockeng.h
index 11f751db8..c50361bc0 100644
--- a/kdesktop/lockeng.h
+++ b/kdesktop/lockeng.h
@@ -18,14 +18,18 @@
#include <tqdbusconnection.h>
+#ifdef WITH_TDEHWLIB
class TDECryptographicCardDevice;
+#else
+#define TDECryptographicCardDevice void
+#endif
class DCOPClientTransaction;
class TQT_DBusMessage;
class TQT_DBusProxy;
class SaverEngineThreadHelperObject : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public slots:
void terminateThread();
@@ -44,7 +48,7 @@ signals:
*/
class SaverEngine : public TQWidget, public KScreensaverIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
SaverEngine();
~SaverEngine();
diff --git a/kdesktop/main.cc b/kdesktop/main.cpp
index b54c03cb7..5a04c9bed 100644
--- a/kdesktop/main.cc
+++ b/kdesktop/main.cpp
@@ -43,7 +43,7 @@
#include <fcntl.h>
#include <stdlib.h>
-#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
+#if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
#define COMPOSITE
#endif
@@ -105,7 +105,7 @@ void KDesktop::slotUpAndRunning()
TDECrash::setEmergencySaveFunction(crashHandler); // Try to restart on crash
}
-extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
+extern "C" TDE_EXPORT int kdemain( int argc, char **argv )
{
//setup signal handling
signal(SIGTERM, signalHandler);
@@ -247,7 +247,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
*qt_no_foreign_hack = true;
// else argb_visual = false ... ? *shrug*
if( argb_visual )
- myApp = new KDesktopApp( dpy, Qt::HANDLE( visual ), 0 );
+ myApp = new KDesktopApp( dpy, TQt::HANDLE( visual ), 0 );
else
XCloseDisplay( dpy );
}
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index 769c49849..1192a0292 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -131,34 +131,34 @@ Minicli::Minicli( TQWidget *parent, const char *name)
m_pURLCompletion = new KURLCompletion(KURLCompletion::FileCompletion);
m_pEXECompletion = new KURLCompletion(KURLCompletion::SystemExeCompletion);
//m_pURLCompletion->setCompletionMode( TDEGlobalSettings::completionMode() );
- connect( m_pURLCompletion, TQT_SIGNAL( match(const TQString&) ), TQT_SLOT( slotMatch(const TQString&) ));
- connect( m_pEXECompletion, TQT_SIGNAL( match(const TQString&) ), TQT_SLOT( slotEXEMatch(const TQString&) ));
+ connect( m_pURLCompletion, TQ_SIGNAL( match(const TQString&) ), TQ_SLOT( slotMatch(const TQString&) ));
+ connect( m_pEXECompletion, TQ_SIGNAL( match(const TQString&) ), TQ_SLOT( slotEXEMatch(const TQString&) ));
// Main widget buttons...
- connect( m_dlg->pbRun, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
- connect( m_dlg->pbCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
- connect( m_dlg->pbOptions, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdvanced()) );
- connect( m_parseTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotParseTimer()) );
+ connect( m_dlg->pbRun, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) );
+ connect( m_dlg->pbCancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) );
+ connect( m_dlg->pbOptions, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdvanced()) );
+ connect( m_parseTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotParseTimer()) );
- connect( m_dlg->cbCommand, TQT_SIGNAL( textChanged( const TQString& ) ),
- TQT_SLOT( slotCmdChanged(const TQString&) ) );
+ connect( m_dlg->cbCommand, TQ_SIGNAL( textChanged( const TQString& ) ),
+ TQ_SLOT( slotCmdChanged(const TQString&) ) );
- connect( m_dlg->cbCommand, TQT_SIGNAL( returnPressed() ),
- m_dlg->pbRun, TQT_SLOT( animateClick() ) );
+ connect( m_dlg->cbCommand, TQ_SIGNAL( returnPressed() ),
+ m_dlg->pbRun, TQ_SLOT( animateClick() ) );
m_dlg->cbCommand->setHistoryEditorEnabled( true );
- connect( m_dlg->cbCommand, TQT_SIGNAL(removed( const TQString&) ), TQT_SLOT(saveConfig()) );
+ connect( m_dlg->cbCommand, TQ_SIGNAL(removed( const TQString&) ), TQ_SLOT(saveConfig()) );
// Advanced group box...
- connect(m_dlg->cbPriority, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChangeScheduler(bool)));
- connect(m_dlg->slPriority, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotPriority(int)));
- connect(m_dlg->cbRealtime, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRealtime(bool)));
- connect(m_dlg->cbAppcomplete, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAppcompleteToggled(bool)));
- connect(m_dlg->cbAutocomplete, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAutocompleteToggled(bool)));
- connect(m_dlg->cbAutohistory, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAutohistoryToggled(bool)));
- connect(m_dlg->cbRunAsOther, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChangeUid(bool)));
- connect(m_dlg->leUsername, TQT_SIGNAL(lostFocus()), TQT_SLOT(updateAuthLabel()));
- connect(m_dlg->cbRunInTerminal, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTerminal(bool)));
+ connect(m_dlg->cbPriority, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChangeScheduler(bool)));
+ connect(m_dlg->slPriority, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotPriority(int)));
+ connect(m_dlg->cbRealtime, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotRealtime(bool)));
+ connect(m_dlg->cbAppcomplete, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAppcompleteToggled(bool)));
+ connect(m_dlg->cbAutocomplete, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAutocompleteToggled(bool)));
+ connect(m_dlg->cbAutohistory, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAutohistoryToggled(bool)));
+ connect(m_dlg->cbRunAsOther, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChangeUid(bool)));
+ connect(m_dlg->leUsername, TQ_SIGNAL(lostFocus()), TQ_SLOT(updateAuthLabel()));
+ connect(m_dlg->cbRunInTerminal, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTerminal(bool)));
m_dlg->slPriority->setValue(50);
@@ -375,7 +375,7 @@ void Minicli::reset()
void Minicli::keyPressEvent( TQKeyEvent* e )
{
- if ( e->key() == Qt::Key_Escape )
+ if ( e->key() == TQt::Key_Escape )
{
e->accept();
m_dlg->pbCancel->animateClick();
@@ -877,7 +877,7 @@ void Minicli::setIcon ()
{
TQBitmap mask = *icon.mask();
bitBlt( &mask, x, y,
- overlay.mask() ? TQT_TQPIXMAP(const_cast<TQBitmap *>(overlay.mask())) : &overlay,
+ overlay.mask() ? const_cast<TQBitmap *>(overlay.mask()) : &overlay,
0, 0, overlay.width(), overlay.height(),
overlay.mask() ? OrROP : SetROP );
icon.setMask(mask);
@@ -1094,6 +1094,3 @@ void Minicli::fontChange( const TQFont & )
{
adjustSize();
}
-
-// vim: set et ts=2 sts=2 sw=2:
-
diff --git a/kdesktop/minicli.h b/kdesktop/minicli.h
index 9d92825c7..c3974a13b 100644
--- a/kdesktop/minicli.h
+++ b/kdesktop/minicli.h
@@ -46,7 +46,7 @@ class KURIFilterData;
class Minicli : public KDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
Minicli( TQWidget *parent=0, const char *name=0 );
diff --git a/kdesktop/minicli_ui.ui b/kdesktop/minicli_ui.ui
index 13d3b9736..93c95c8f0 100644
--- a/kdesktop/minicli_ui.ui
+++ b/kdesktop/minicli_ui.ui
@@ -640,21 +640,14 @@
</tabstops>
<includes>
<include location="global" impldecl="in declaration">fixx11h.h</include>
+ <include location="local" impldecl="in implementation">kcombobox.h</include>
<include location="local" impldecl="in implementation">kdialog.h</include>
<include location="local" impldecl="in implementation">kiconloader.h</include>
- <include location="local" impldecl="in implementation">kpassdlg.h</include>
- <include location="local" impldecl="in implementation">kcombobox.h</include>
<include location="local" impldecl="in implementation">klineedit.h</include>
+ <include location="local" impldecl="in implementation">kpassdlg.h</include>
<include location="local" impldecl="in implementation">kpushbutton.h</include>
</includes>
<pixmapfunction>BarIcon</pixmapfunction>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpassdlg.h</includehint>
- <includehint>kcombobox.h</includehint>
-</includehints>
</UI>
diff --git a/kdesktop/pixmapserver.cc b/kdesktop/pixmapserver.cpp
index 7a480cdb6..56224f37a 100644
--- a/kdesktop/pixmapserver.cc
+++ b/kdesktop/pixmapserver.cpp
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* This file is part of the KDE project, module kdesktop.
* Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
diff --git a/kdesktop/pixmapserver.h b/kdesktop/pixmapserver.h
index 3084cd0a3..661d531ad 100644
--- a/kdesktop/pixmapserver.h
+++ b/kdesktop/pixmapserver.h
@@ -1,4 +1,4 @@
-/* vi: ts=8 sts=4 sw=4
+/*
*
* This file is part of the KDE project, module kdesktop.
* Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
@@ -24,7 +24,7 @@
struct KPixmapInode
{
- Qt::HANDLE handle;
+ TQt::HANDLE handle;
Atom selection;
};
@@ -37,7 +37,7 @@ struct KPixmapData
struct TDESelectionInode
{
- Qt::HANDLE handle;
+ TQt::HANDLE handle;
TQString name;
};
@@ -50,7 +50,7 @@ struct TDESelectionInode
*/
class KPixmapServer: public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KPixmapServer();
diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp
index 4027b7e9a..7d448c089 100644
--- a/kdesktop/startupid.cpp
+++ b/kdesktop/startupid.cpp
@@ -56,16 +56,16 @@ StartupId::StartupId( TQWidget* parent, const char* name )
XSelectInput( tqt_xdisplay(), tqt_xrootwin(), attrs.your_event_mask | SubstructureNotifyMask);
kapp->installX11EventFilter( this );
}
- connect( &update_timer, TQT_SIGNAL( timeout()), TQT_SLOT( update_startupid()));
+ connect( &update_timer, TQ_SIGNAL( timeout()), TQ_SLOT( update_startupid()));
connect( &startup_info,
- TQT_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
- TQT_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )));
+ TQ_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+ TQ_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )));
connect( &startup_info,
- TQT_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )),
- TQT_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )));
+ TQ_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+ TQ_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )));
connect( &startup_info,
- TQT_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
- TQT_SLOT( gotRemoveStartup( const TDEStartupInfoId& )));
+ TQ_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+ TQ_SLOT( gotRemoveStartup( const TDEStartupInfoId& )));
}
StartupId::~StartupId()
@@ -129,10 +129,10 @@ bool StartupId::x11Event( XEvent* e )
if( startups.count() == 0 )
start_startupid( KDE_STARTUP_ICON );
// 60(?) sec timeout - shouldn't be hopefully needed anyway, ksmserver should have it too
- TQTimer::singleShot( 60000, this, TQT_SLOT( finishKDEStartup()));
+ TQTimer::singleShot( 60000, this, TQ_SLOT( finishKDEStartup()));
}
else if( strcmp( s, "session ready" ) == 0 && kde_startup_status < StartupDone )
- TQTimer::singleShot( 2000, this, TQT_SLOT( finishKDEStartup()));
+ TQTimer::singleShot( 2000, this, TQ_SLOT( finishKDEStartup()));
}
return false;
}
@@ -176,7 +176,7 @@ void StartupId::start_startupid( const TQString& icon_P )
{
const TQColor startup_colors[ StartupId::NUM_BLINKING_PIXMAPS ]
- = { Qt::black, Qt::darkGray, Qt::lightGray, Qt::white, Qt::white };
+ = { TQt::black, TQt::darkGray, TQt::lightGray, TQt::white, TQt::white };
TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( icon_P, TDEIcon::Small, 0,
diff --git a/kdesktop/startupid.h b/kdesktop/startupid.h
index 893d0b8db..27345d598 100644
--- a/kdesktop/startupid.h
+++ b/kdesktop/startupid.h
@@ -34,7 +34,7 @@ class TQStyle;
class StartupId
: public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
StartupId( TQWidget* parent = 0, const char* name = 0 );
virtual ~StartupId();
diff --git a/kdesktop/tdefileividesktop.h b/kdesktop/tdefileividesktop.h
index 46f77f636..0434a706e 100644
--- a/kdesktop/tdefileividesktop.h
+++ b/kdesktop/tdefileividesktop.h
@@ -33,7 +33,7 @@
/*
* The dither flags used to display the shadow image
*/
-#define DITHER_FLAGS (Qt::DiffuseAlphaDither | Qt::ColorOnly | Qt::AvoidDither)
+#define DITHER_FLAGS (TQt::DiffuseAlphaDither | TQt::ColorOnly | TQt::AvoidDither)
class TQFont;
diff --git a/kdesktop/xautolock.cc b/kdesktop/xautolock.cpp
index 3c7e62670..3c7e62670 100644
--- a/kdesktop/xautolock.cc
+++ b/kdesktop/xautolock.cpp
diff --git a/kdesktop/xautolock.h b/kdesktop/xautolock.h
index 5684ce6ef..a30405339 100644
--- a/kdesktop/xautolock.h
+++ b/kdesktop/xautolock.h
@@ -19,7 +19,7 @@
//
class XAutoLock : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
XAutoLock();
~XAutoLock();
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 08:58:02 +0000