summaryrefslogtreecommitdiffstats
path: root/kicker/kicker/ui/k_new_mnu.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/kicker/ui/k_new_mnu.cpp')
-rw-r--r--kicker/kicker/ui/k_new_mnu.cpp267
1 files changed, 136 insertions, 131 deletions
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 712868adb..324c46f0e 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -31,6 +31,11 @@
#include <dmctl.h>
#include <inttypes.h>
+#ifdef Q_OS_SOLARIS
+#include <sys/statvfs.h>
+#define statfs statvfs
+#endif /* Q_OS_SOLARIS */
+
#include <tqimage.h>
#include <tqpainter.h>
#include <tqstyle.h>
@@ -63,7 +68,7 @@
#include <klineedit.h>
#include <tdelocale.h>
#include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kcombobox.h>
#include <twin.h>
#include <kdebug.h>
@@ -76,7 +81,7 @@
#include <kurifilter.h>
#include <kbookmarkmanager.h>
#include <kbookmark.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tdeio/jobclasses.h>
#include <tdeio/job.h>
#include <dcopref.h>
@@ -201,15 +206,15 @@ KMenu::KMenu()
m_iconName(TQString()), m_orientation(UnDetermined), m_search_plugin( 0 )
{
setMouseTracking(true);
- connect(&m_sloppyTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotSloppyTimeout()));
+ connect(&m_sloppyTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotSloppyTimeout()));
// set the first client id to some arbitrarily large value.
client_id = 10000;
// Don't automatically clear the main menu.
actionCollection = new TDEActionCollection(this);
- connect(Kicker::the(), TQT_SIGNAL(configurationChanged()),
- this, TQT_SLOT(configChanged()));
+ connect(Kicker::the(), TQ_SIGNAL(configurationChanged()),
+ this, TQ_SLOT(configChanged()));
KUser * user = new KUser();
@@ -223,7 +228,7 @@ KMenu::KMenu()
setupUi();
m_userInfo->setBackgroundMode( PaletteBase );
- TQColor userInfoColor = TQApplication::palette().color( TQPalette::Normal, TQColorGroup::Mid );
+ TQColor userInfoColor = TQApplication::palette().color( TQPalette::Active, TQColorGroup::Mid );
if ( tqGray( userInfoColor.rgb() ) > 120 )
userInfoColor = userInfoColor.dark( 200 );
else
@@ -231,7 +236,7 @@ KMenu::KMenu()
m_userInfo->setPaletteForegroundColor( userInfoColor );
m_tabBar = new KickoffTabBar(this, "m_tabBar");
- connect(m_tabBar, TQT_SIGNAL(tabClicked(TQTab*)), TQT_SLOT(tabClicked(TQTab*)));
+ connect(m_tabBar, TQ_SIGNAL(tabClicked(TQTab*)), TQ_SLOT(tabClicked(TQTab*)));
const int tab_icon_size = 32;
@@ -279,8 +284,8 @@ KMenu::KMenu()
m_tabs[LeaveTab]->setIconSet(BarIcon("leave", tab_icon_size));
}
- connect(m_tabBar, TQT_SIGNAL(selected(int)), m_stacker, TQT_SLOT(raiseWidget(int)));
- connect(m_stacker, TQT_SIGNAL(aboutToShow(int)), m_tabBar, TQT_SLOT(setCurrentTab(int)));
+ connect(m_tabBar, TQ_SIGNAL(selected(int)), m_stacker, TQ_SLOT(raiseWidget(int)));
+ connect(m_stacker, TQ_SIGNAL(aboutToShow(int)), m_tabBar, TQ_SLOT(setCurrentTab(int)));
m_favoriteView = new FavoritesItemView (m_stacker, "m_favoriteView");
m_favoriteView->setAcceptDrops(true);
@@ -295,11 +300,11 @@ KMenu::KMenu()
m_browserView = new FlipScrollView(m_stacker, "m_browserView");
m_stacker->addWidget(m_browserView, ApplicationsTab);
- connect( m_browserView, TQT_SIGNAL( backButtonClicked() ), TQT_SLOT( slotGoBack() ) );
+ connect( m_browserView, TQ_SIGNAL( backButtonClicked() ), TQ_SLOT( slotGoBack() ) );
m_exitView = new FlipScrollView(m_stacker, "m_exitView");
m_stacker->addWidget(m_exitView, LeaveTab);
- connect( m_exitView, TQT_SIGNAL( backButtonClicked() ), TQT_SLOT( slotGoExitMainMenu() ) );
+ connect( m_exitView, TQ_SIGNAL( backButtonClicked() ), TQ_SLOT( slotGoExitMainMenu() ) );
m_searchWidget = new TQVBox (m_stacker, "m_searchWidget");
m_searchWidget->setSpacing(0);
@@ -326,7 +331,7 @@ KMenu::KMenu()
m_searchResultsWidget->setItemMargin(4);
// m_searchResultsWidget->setIconSize(16);
m_searchActions = new ItemView (m_searchWidget, "m_searchActions");
- m_searchActions->setFocusPolicy(TQ_NoFocus);
+ m_searchActions->setFocusPolicy(TQWidget::NoFocus);
m_searchActions->setItemMargin(4);
m_searchInternet = new TQListViewItem(m_searchActions, i18n("Search Internet"));
m_searchInternet->setPixmap(0,icon);
@@ -336,40 +341,40 @@ KMenu::KMenu()
m_searchActions->setMaximumHeight(5+m_searchInternet->height());
- connect(m_searchActions, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(searchActionClicked(TQListViewItem*)));
- connect(m_searchActions, TQT_SIGNAL(returnPressed(TQListViewItem*)), TQT_SLOT(searchActionClicked(TQListViewItem*)));
- connect(m_searchActions, TQT_SIGNAL(spacePressed(TQListViewItem*)), TQT_SLOT(searchActionClicked(TQListViewItem*)));
+ connect(m_searchActions, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(searchActionClicked(TQListViewItem*)));
+ connect(m_searchActions, TQ_SIGNAL(returnPressed(TQListViewItem*)), TQ_SLOT(searchActionClicked(TQListViewItem*)));
+ connect(m_searchActions, TQ_SIGNAL(spacePressed(TQListViewItem*)), TQ_SLOT(searchActionClicked(TQListViewItem*)));
- connect(m_searchResultsWidget, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr)));
- connect(m_searchResultsWidget, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&)));
- connect(m_searchResultsWidget, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
+ connect(m_searchResultsWidget, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr)));
+ connect(m_searchResultsWidget, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&)));
+ connect(m_searchResultsWidget, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
- connect(m_recentlyView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr)));
- connect(m_recentlyView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&)));
- connect(m_recentlyView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
+ connect(m_recentlyView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr)));
+ connect(m_recentlyView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&)));
+ connect(m_recentlyView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
- connect(m_favoriteView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr)));
- connect(m_favoriteView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&)));
- connect(m_favoriteView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
- connect(m_favoriteView, TQT_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), TQT_SLOT(slotFavoritesMoved( TQListViewItem*, TQListViewItem*, TQListViewItem* )));
+ connect(m_favoriteView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr)));
+ connect(m_favoriteView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&)));
+ connect(m_favoriteView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
+ connect(m_favoriteView, TQ_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), TQ_SLOT(slotFavoritesMoved( TQListViewItem*, TQListViewItem*, TQListViewItem* )));
- connect(m_systemView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&)));
- connect(m_systemView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr)));
- connect(m_systemView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
+ connect(m_systemView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&)));
+ connect(m_systemView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr)));
+ connect(m_systemView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
- connect(m_browserView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotGoSubMenu(const TQString&)));
- connect(m_browserView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr)));
- connect(m_browserView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
+ connect(m_browserView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotGoSubMenu(const TQString&)));
+ connect(m_browserView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr)));
+ connect(m_browserView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
- connect(m_exitView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&)));
- connect(m_exitView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
+ connect(m_exitView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&)));
+ connect(m_exitView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int )));
m_kcommand->setDuplicatesEnabled( false );
m_kcommand->setLineEdit(new KLineEdit(m_kcommand, "m_kcommand-lineedit"));
m_kcommand->setCompletionMode( TDEGlobalSettings::CompletionAuto );
- connect(m_kcommand, TQT_SIGNAL(cleared()), TQT_SLOT(clearedHistory()));
- connect(m_kcommand->lineEdit(), TQT_SIGNAL(returnPressed()), TQT_SLOT(searchAccept()));
- connect(m_kcommand->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(searchChanged(const TQString &)));
+ connect(m_kcommand, TQ_SIGNAL(cleared()), TQ_SLOT(clearedHistory()));
+ connect(m_kcommand->lineEdit(), TQ_SIGNAL(returnPressed()), TQ_SLOT(searchAccept()));
+ connect(m_kcommand->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(searchChanged(const TQString &)));
// URI Filter meta object...
m_filterData = new KURIFilterData();
@@ -378,14 +383,14 @@ KMenu::KMenu()
categorised_hit_total = new int [num_categories];
input_timer = new TQTimer (this, "input_timer");
- connect( input_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doQuery()) );
+ connect( input_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doQuery()) );
init_search_timer = new TQTimer (this, "init_search_timer");
- connect( init_search_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(initSearch()) );
+ connect( init_search_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(initSearch()) );
init_search_timer->start(2000, true);
- connect( m_favoriteView, TQT_SIGNAL( dropped (TQDropEvent *, TQListViewItem * ) ),
- TQT_SLOT( slotFavDropped( TQDropEvent *, TQListViewItem * ) ) );
+ connect( m_favoriteView, TQ_SIGNAL( dropped (TQDropEvent *, TQListViewItem * ) ),
+ TQ_SLOT( slotFavDropped( TQDropEvent *, TQListViewItem * ) ) );
this->installEventFilter(this);
m_tabBar->installEventFilter(this);
@@ -445,10 +450,10 @@ void KMenu::setupUi()
m_stacker->setGeometry( TQRect( 90, 260, 320, 220 ) );
m_stacker->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 1, 1, m_stacker->sizePolicy().hasHeightForWidth() ) );
m_stacker->setPaletteBackgroundColor( TQColor( 255, 255, 255 ) );
- // m_stacker->setFocusPolicy( TQ_StrongFocus );
+ // m_stacker->setFocusPolicy( TQWidget::StrongFocus );
m_stacker->setLineWidth( 0 );
- m_stacker->setFocusPolicy(TQ_NoFocus);
- connect(m_stacker, TQT_SIGNAL(aboutToShow(TQWidget*)), TQT_SLOT(stackWidgetRaised(TQWidget*)));
+ m_stacker->setFocusPolicy(TQWidget::NoFocus);
+ connect(m_stacker, TQ_SIGNAL(aboutToShow(TQWidget*)), TQ_SLOT(stackWidgetRaised(TQWidget*)));
m_kcommand->setName("m_kcommand");
}
@@ -475,16 +480,16 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
TQPoint p;
if (e->type() == TQEvent::MouseMove || e->type() == TQEvent::MouseButtonPress) {
- TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
+ TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
p = me->globalPos();
}
else if (e->type() == TQEvent::Wheel) {
- TQWheelEvent* we = TQT_TQWHEELEVENT(e);
+ TQWheelEvent* we = static_cast<TQWheelEvent*>(e);
p = we->globalPos();
}
while (receiver) {
- if (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_tabBar) && (e->type()!=TQEvent::MouseMove || KickerSettings::kickoffSwitchTabsOnHover() ) ) {
+ if (receiver == m_tabBar && (e->type()!=TQEvent::MouseMove || KickerSettings::kickoffSwitchTabsOnHover() ) ) {
TQTab* s = m_tabBar->selectTab(m_tabBar->mapFromGlobal(p));
if (s && s->identifier() == ApplicationsTab)
raiseWidget = m_browserView;
@@ -504,8 +509,8 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
/* we do not want hover activation for the search line edit as this can be
* pretty disturbing */
- if ( (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_searchPixmap) ||
- ( ( TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_searchLabel) || TQT_BASE_OBJECT(receiver)==TQT_BASE_OBJECT(m_kcommand->lineEdit()) ) &&
+ if ( (receiver == m_searchPixmap ||
+ ( ( receiver == m_searchLabel || receiver==m_kcommand->lineEdit() ) &&
( e->type() == TQEvent::KeyPress || e->type() == TQEvent::Wheel
|| e->type() == TQEvent::MouseButtonPress ) ) ) &&
!m_isShowing) {
@@ -517,25 +522,25 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
if(raiseWidget)
break;
if(receiver->isWidgetType())
- receiver = TQT_TQOBJECT(TQT_TQWIDGET(receiver)->parentWidget(true));
+ receiver = static_cast<TQWidget*>(receiver)->parentWidget(true);
else
break;
}
if (e->type() == TQEvent::FocusIn && receiver && raiseWidget) {
- m_searchResultsWidget->setFocusPolicy(TQ_StrongFocus);
+ m_searchResultsWidget->setFocusPolicy(TQWidget::StrongFocus);
m_searchActions->setFocusPolicy(raiseWidget == m_searchWidget ?
- TQ_StrongFocus : TQ_NoFocus);
+ TQWidget::StrongFocus : TQWidget::NoFocus);
setTabOrder(raiseWidget, m_searchResultsWidget);
if (raiseWidget != m_stacker->visibleWidget()
- && TQT_TQWIDGET(receiver)->focusPolicy() == TQ_NoFocus
+ && static_cast<TQWidget*>(receiver)->focusPolicy() == TQWidget::NoFocus
&& m_stacker->id(raiseWidget) >= 0) {
m_stacker->raiseWidget(raiseWidget);
return true;
}
- if (raiseWidget->focusPolicy() != TQ_NoFocus)
+ if (raiseWidget->focusPolicy() != TQWidget::NoFocus)
return false;
}
@@ -557,7 +562,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
}
if(e->type() == TQEvent::Enter && receiver->isWidgetType()) {
- TQT_TQWIDGET(receiver)->setMouseTracking(true);
+ static_cast<TQWidget*>(receiver)->setMouseTracking(true);
TQToolTip::hide();
}
@@ -584,7 +589,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
if (view)
{
bool handled = true;
- switch (TQT_TQKEYEVENT(e)->key()) {
+ switch (static_cast<TQKeyEvent*>(e)->key()) {
case Key_Up:
if (view->selectedItem()) {
view->setSelected(view->selectedItem()->itemAbove(),true);
@@ -661,7 +666,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
r = true;
}
- if (e->type() == TQEvent::Enter && TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_stacker))
+ if (e->type() == TQEvent::Enter && receiver == m_stacker)
{
TQRect r(m_stacker->mapToGlobal(TQPoint(-8,-32)), m_stacker->size());
r.setSize(r.size()+TQSize(16,128));
@@ -738,8 +743,8 @@ void KMenu::paintSearchTab( bool active )
m_tabBar->deactivateTabs(true);
- p.setBrush( Qt::white );
- p.setPen( Qt::NoPen );
+ p.setBrush( TQt::white );
+ p.setPen( TQt::NoPen );
if ( m_orientation == BottomUp ) {
search_tab_center.convertFromImage( search_tab_center.convertToImage().scale(search_tab_center.width(), m_searchFrame->height()));
@@ -1220,18 +1225,18 @@ void KMenu::initialize()
kdDebug(1210) << "KMenu::initialize()" << endl;
// in case we've been through here before, let's disconnect
- disconnect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()),
- this, TQT_SLOT(paletteChanged()));
- connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()),
- this, TQT_SLOT(paletteChanged()));
+ disconnect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()),
+ this, TQ_SLOT(paletteChanged()));
+ connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()),
+ this, TQ_SLOT(paletteChanged()));
/*
If the user configured ksmserver to
*/
TDEConfig ksmserver("ksmserverrc", false, false);
ksmserver.setGroup("General");
- connect( m_branding, TQT_SIGNAL(clicked()), TQT_SLOT(slotOpenHomepage()));
- m_tabBar->setTabEnabled(LeaveTab, kapp->authorize("logout"));
+ connect( m_branding, TQ_SIGNAL(clicked()), TQ_SLOT(slotOpenHomepage()));
+ m_tabBar->setTabEnabled(LeaveTab, tdeApp->authorize("logout"));
// load search field history
TQStringList histList = KickerSettings::history();
@@ -1279,7 +1284,7 @@ void KMenu::initialize()
for (TQStringList::ConstIterator it = favs.begin(); it != favs.end(); ++it)
{
if ((*it)[0]=='/') {
- KDesktopFile df((*it),true);
+ TDEDesktopFile df((*it),true);
TQString url = df.readURL();
if (!KURL(url).isLocalFile() || TQFile::exists(url.replace("file://",TQString())))
m_favoriteView->insertItem(df.readIcon(),df.readName(),df.readGenericName(), url, nId++, index++);
@@ -1304,10 +1309,10 @@ void KMenu::insertStaticExitItems()
int index = 1;
m_exitView->leftView()->insertSeparator( nId++, i18n("Session"), index++ );
- if (kapp->authorize("logout"))
+ if (tdeApp->authorize("logout"))
m_exitView->leftView()->insertItem( "edit-undo", i18n( "Log out" ),
i18n( "End current session" ), "kicker:/logout", nId++, index++ );
- if (kapp->authorize("lock_screen"))
+ if (tdeApp->authorize("lock_screen"))
m_exitView->leftView()->insertItem( "system-lock-screen", i18n( "Lock" ),
i18n( "Lock computer screen" ), "kicker:/lock", nId++, index++ );
@@ -1319,7 +1324,7 @@ void KMenu::insertStaticExitItems()
i18n("Save current Session for next login"),
"kicker:/savesession", nId++, index++ );
}
- if (DM().isSwitchable() && kapp->authorize("switch_user"))
+ if (DM().isSwitchable() && tdeApp->authorize("switch_user"))
{
KMenuItem *switchuser = m_exitView->leftView()->insertItem( "switchuser", i18n( "Switch User" ),
i18n( "Manage parallel sessions" ), "kicker:/switchuser/", nId++, index++ );
@@ -1381,7 +1386,7 @@ void KMenu::insertStaticItems()
m_systemView->insertMenuItem(p, nId++, index++);
// run command
- if (kapp->authorize("run_command"))
+ if (tdeApp->authorize("run_command"))
{
m_systemView->insertItem( "system-run", i18n("Run Command..."),
"", "kicker:/runusercommand", nId++, index++ );
@@ -1440,11 +1445,11 @@ void KMenu::insertStaticItems()
m_systemView->insertItem( "network", i18n( "Network Folders" ),
"remote:/", "remote:/", nId++, index++ );
- m_mediaWatcher = new MediaWatcher( TQT_TQOBJECT(this) );
- connect( m_mediaWatcher, TQT_SIGNAL( mediumChanged() ), TQT_SLOT( updateMedia() ) );
+ m_mediaWatcher = new MediaWatcher( this );
+ connect( m_mediaWatcher, TQ_SIGNAL( mediumChanged() ), TQ_SLOT( updateMedia() ) );
m_media_id = 0;
- connect(&m_mediaFreeTimer, TQT_SIGNAL(timeout()), TQT_SLOT( updateMedia()));
+ connect(&m_mediaFreeTimer, TQ_SIGNAL(timeout()), TQ_SLOT( updateMedia()));
}
int KMenu::insertClientMenu(KickerClientMenu *)
@@ -1474,18 +1479,18 @@ void KMenu::slotLock()
TQCString appname( "kdesktop" );
if ( kicker_screen_number )
appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
- kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
+ tdeApp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
}
void KMenu::slotOpenHomepage()
{
accept();
- kapp->invokeBrowser("http://www.trinitydesktop.org");
+ tdeApp->invokeBrowser("http://www.trinitydesktop.org");
}
void KMenu::slotLogout()
{
- kapp->requestShutDown();
+ tdeApp->requestShutDown();
}
void KMenu::slotPopulateSessions()
@@ -1494,9 +1499,9 @@ void KMenu::slotPopulateSessions()
DM dm;
sessionsMenu->clear();
- if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0)
+ if (tdeApp->authorize("start_new_session") && (p = dm.numReserve()) >= 0)
{
- if (kapp->authorize("lock_screen"))
+ if (tdeApp->authorize("lock_screen"))
sessionsMenu->insertItem(/*SmallIconSet("lockfork"),*/ i18n("Lock Current && Start New Session"), 100 );
sessionsMenu->insertItem(SmallIconSet("fork"), i18n("Start New Session"), 101 );
if (!p) {
@@ -1529,7 +1534,7 @@ void KMenu::slotSessionActivated( int ent )
void KMenu::doNewSession( bool lock )
{
int result = KMessageBox::warningContinueCancel(
- TQT_TQWIDGET(kapp->desktop()->screen(kapp->desktop()->screenNumber(this))),
+ tdeApp->desktop()->screen(tdeApp->desktop()->screenNumber(this)),
i18n("<p>You have chosen to open another desktop session.<br>"
"The current session will be hidden "
"and a new login screen will be displayed.<br>"
@@ -1578,8 +1583,8 @@ void KMenu::searchAccept()
if ( logout )
{
- kapp->propagateSessionManager();
- kapp->requestShutDown();
+ tdeApp->propagateSessionManager();
+ tdeApp->requestShutDown();
}
if ( lock )
{
@@ -1587,7 +1592,7 @@ void KMenu::searchAccept()
int kicker_screen_number = tqt_xscreen();
if ( kicker_screen_number )
appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
- kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
+ tdeApp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
}
}
@@ -1651,7 +1656,7 @@ bool KMenu::runCommand()
// fall-through to shell case
case KURIFilterData::SHELL:
{
- if (kapp->authorize("shell_access"))
+ if (tdeApp->authorize("shell_access"))
{
exec = cmd;
@@ -1747,7 +1752,7 @@ void KMenu::setOrientation(MenuOrientation orientation)
m_orientation=orientation;
- m_resizeHandle->setCursor(m_orientation == BottomUp ? tqsizeBDiagCursor : tqsizeFDiagCursor);
+ m_resizeHandle->setCursor(m_orientation == BottomUp ? TQt::sizeBDiagCursor : TQt::sizeFDiagCursor);
TQPixmap pix;
if ( m_orientation == BottomUp )
@@ -1969,7 +1974,7 @@ void KMenu::searchChanged(const TQString & text)
if (input_timer->isActive ())
input_timer->stop ();
- input_timer->start (WAIT_BEFORE_QUERYING, TRUE);
+ input_timer->start (WAIT_BEFORE_QUERYING, true);
}
bool KMenu::dontQueryNow (const TQString& str)
@@ -1996,7 +2001,7 @@ void KMenu::createNewProgramList()
m_seenPrograms = KickerSettings::firstSeenApps();
m_newInstalledPrograms.clear();
- m_currentDate = TQDate::currentDate().toString(Qt::ISODate);
+ m_currentDate = TQDate::currentDate().toString(TQt::ISODate);
bool initialize = (m_seenPrograms.count() == 0);
@@ -2058,7 +2063,7 @@ void KMenu::createNewProgramList(TQString relPath)
else {
++it_find;
if (*(it_find)!="-") {
- TQDate date = TQDate::fromString(*(it_find),Qt::ISODate);
+ TQDate date = TQDate::fromString(*(it_find),TQt::ISODate);
if (date.daysTo(TQDate::currentDate())<3) {
if (m_newInstalledPrograms.find(s->storageId())==m_newInstalledPrograms.end())
m_newInstalledPrograms+=s->storageId();
@@ -2278,7 +2283,7 @@ TQString KMenu::insertBreaks(const TQString& text, TQFontMetrics fm, int width,
void KMenu::clearSearchResults(bool showHelp)
{
m_searchResultsWidget->clear();
- m_searchResultsWidget->setFocusPolicy(showHelp ? TQ_NoFocus : TQ_StrongFocus);
+ m_searchResultsWidget->setFocusPolicy(showHelp ? TQWidget::NoFocus : TQWidget::StrongFocus);
setTabOrder(m_kcommand, m_searchResultsWidget);
if (showHelp) {
@@ -2414,7 +2419,7 @@ void KMenu::doQuery (bool return_pressed)
#endif
)
exe = TQString();
- else if (kapp->authorize("shell_access"))
+ else if (tdeApp->authorize("shell_access"))
{
if( filterData.hasArgsAndOptions() )
exe += filterData.argsAndOptions();
@@ -2614,7 +2619,7 @@ TQString KMenu::iconForHitMenuItem(HitMenuItem *hit_item)
return (mimetype_iconstore [hit_item->mimetype]);
else {
KMimeType::Ptr mimetype_ptr = KMimeType::mimeType (hit_item->mimetype);
- TQString mimetype_icon = mimetype_ptr->icon(TQString(), FALSE);
+ TQString mimetype_icon = mimetype_ptr->icon(TQString(), false);
mimetype_iconstore [hit_item->mimetype] = mimetype_icon;
return mimetype_icon;
}
@@ -2655,7 +2660,7 @@ void KMenu::slotStartURL(const TQString& u)
TQDataStream stream(params, IO_WriteOnly);
stream << 0 << -1 << "";
- kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
+ tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
}
else if ( u == "kicker:/runcommand" )
{
@@ -2670,14 +2675,14 @@ void KMenu::slotStartURL(const TQString& u)
TQDataStream stream(params, IO_WriteOnly);
stream << 2 << -1 << "";
- kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
+ tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
}
else if ( u == "kicker:/restart" ) {
TQByteArray params;
TQDataStream stream(params, IO_WriteOnly);
stream << 1 << -1 << TQString();
- kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
+ tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
}
else if ( u == "kicker:/suspend_freeze" ) {
slotSuspend( SuspendType::Freeze );
@@ -2696,7 +2701,7 @@ void KMenu::slotStartURL(const TQString& u)
}
else if ( u == "kicker:/savesession" ) {
TQByteArray data;
- kapp->dcopClient()->send( "ksmserver", "default",
+ tdeApp->dcopClient()->send( "ksmserver", "default",
"saveCurrentSession()", data );
}
else if ( u == "kicker:/switchuser" ) {
@@ -2717,7 +2722,7 @@ void KMenu::slotStartURL(const TQString& u)
TQDataStream stream(params, IO_WriteOnly);
stream << 1 << -1 << rebootOptions[u.mid(16).toInt()];
- kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
+ tdeApp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
}
#warning restart entry not supported
#if 0
@@ -2748,19 +2753,19 @@ void KMenu::slotStartURL(const TQString& u)
TQDataStream arg(data, IO_WriteOnly);
arg << u.mid(9,22);
- kapp->dcopClient()->send("knotes","KNotesIface","showNote(TQString)", data);
+ tdeApp->dcopClient()->send("knotes","KNotesIface","showNote(TQString)", data);
}
return;
}
- kapp->propagateSessionManager();
+ tdeApp->propagateSessionManager();
(void) new KRun( u, parentWidget());
}
}
void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos, int /*col*/ )
{
- const TQObject* source = TQT_TQOBJECT_CONST(sender());
+ const TQObject* source = sender();
if (!item)
return;
@@ -2784,18 +2789,18 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
m_popupPath.icon = kitem->icon();
if (m_popupPath.path.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) {
- KDesktopFile df(m_popupPath.path,true);
+ TDEDesktopFile df(m_popupPath.path,true);
m_popupPath.path=df.readURL();
}
}
m_popupMenu = new TDEPopupMenu(this);
- connect(m_popupMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContextMenu(int)));
+ connect(m_popupMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotContextMenu(int)));
bool hasEntries = false;
m_popupMenu->insertTitle(SmallIcon(kitem->icon()),kitem->title());
- if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_favoriteView))
+ if (source==m_favoriteView)
{
hasEntries = true;
m_popupMenu->insertItem(SmallIconSet("remove"),
@@ -2817,7 +2822,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
{
if ((*it)[0]=='/')
{
- KDesktopFile df((*it),true);
+ TDEDesktopFile df((*it),true);
if (df.readURL().replace("file://",TQString())==m_popupPath.path)
break;
}
@@ -2827,12 +2832,12 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
}
}
- if (TQT_BASE_OBJECT_CONST(source)!=TQT_BASE_OBJECT(m_exitView)) {
+ if (source!=m_exitView) {
if (m_popupService || (!m_popupPath.path.startsWith("kicker:/") && !m_popupPath.path.startsWith("system:/") && !m_popupPath.path.startsWith("kaddressbook:/"))) {
if (hasEntries)
m_popupMenu->insertSeparator();
- if (kapp->authorize("editable_desktop_icons") )
+ if (tdeApp->authorize("editable_desktop_icons") )
{
hasEntries = true;
if (m_popupPath.menuPath.endsWith("/"))
@@ -2842,7 +2847,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
m_popupMenu->insertItem(SmallIconSet("desktop"),
i18n("Add Item to Desktop"), AddItemToDesktop);
}
- if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
+ if (tdeApp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
{
hasEntries = true;
if (m_popupPath.menuPath.endsWith("/"))
@@ -2852,7 +2857,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
m_popupMenu->insertItem(SmallIconSet("kicker"),
i18n("Add Item to Main Panel"), AddItemToPanel);
}
- if (kapp->authorizeTDEAction("menuedit") && !kitem->menuPath().isEmpty())
+ if (tdeApp->authorizeTDEAction("menuedit") && !kitem->menuPath().isEmpty())
{
hasEntries = true;
if (kitem->menuPath().endsWith("/"))
@@ -2860,14 +2865,14 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
else
m_popupMenu->insertItem(SmallIconSet("kmenuedit"), i18n("Edit Item"), EditItem);
}
- if (kapp->authorize("run_command") && (m_popupService || (!m_popupPath.menuPath.isEmpty() && !m_popupPath.menuPath.endsWith("/"))))
+ if (tdeApp->authorize("run_command") && (m_popupService || (!m_popupPath.menuPath.isEmpty() && !m_popupPath.menuPath.endsWith("/"))))
{
hasEntries = true;
m_popupMenu->insertItem(SmallIconSet("system-run"),
i18n("Put Into Run Dialog"), PutIntoRunDialog);
}
}
- if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_searchResultsWidget) || ((TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_favoriteView) || TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_recentlyView) || TQT_BASE_OBJECT_CONST(source) == TQT_BASE_OBJECT(m_systemView)) && !m_popupService && !m_popupPath.path.startsWith("kicker:/")) ) {
+ if (source==m_searchResultsWidget || ((source==m_favoriteView || source==m_recentlyView || source == m_systemView) && !m_popupService && !m_popupPath.path.startsWith("kicker:/")) ) {
TQString uri;
if (m_popupService)
uri = locate("apps", m_popupService->desktopEntryPath());
@@ -2904,7 +2909,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
}
}
- if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_recentlyView)) {
+ if (source==m_recentlyView) {
m_popupMenu->insertSeparator();
if (m_popupService)
m_popupMenu->insertItem(SmallIconSet("history_clear"),
@@ -2949,7 +2954,7 @@ void KMenu::slotContextMenu(int selected)
job->setDefaultPermissions( true );
}
else {
- KDesktopFile* df = new KDesktopFile( newDesktopFile(KURL(m_popupPath.path), TDEGlobalSettings::desktopPath() ) );
+ TDEDesktopFile* df = new TDEDesktopFile( newDesktopFile(KURL(m_popupPath.path), TDEGlobalSettings::desktopPath() ) );
df->writeEntry("GenericName", m_popupPath.description);
df->writeEntry( "Icon", m_popupPath.icon );
df->writePathEntry( "URL", m_popupPath.path );
@@ -2964,17 +2969,17 @@ void KMenu::slotContextMenu(int selected)
case AddItemToPanel:
accept();
if (m_popupService)
- kapp->dcopClient()->send("kicker", "Panel", "addServiceButton(TQString)", m_popupService->desktopEntryPath());
+ tdeApp->dcopClient()->send("kicker", "Panel", "addServiceButton(TQString)", m_popupService->desktopEntryPath());
else
#warning FIXME special RecentDocuments/foo.desktop handling
- kapp->dcopClient()->send("kicker", "Panel", "addURLButton(TQString)", m_popupPath.path);
+ tdeApp->dcopClient()->send("kicker", "Panel", "addURLButton(TQString)", m_popupPath.path);
accept();
break;
case EditItem:
case EditMenu:
accept();
- proc = new TDEProcess(TQT_TQOBJECT(this));
+ proc = new TDEProcess(this);
*proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
*proc << "/"+m_popupPath.menuPath.section('/',-200,-2) << m_popupPath.menuPath.section('/', -1);
proc->start();
@@ -2983,16 +2988,16 @@ void KMenu::slotContextMenu(int selected)
case PutIntoRunDialog:
accept();
if (m_popupService)
- kapp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupService->exec());
+ tdeApp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupService->exec());
else
#warning FIXME special RecentDocuments/foo.desktop handling
- kapp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupPath.path);
+ tdeApp->dcopClient()->send("kdesktop", "default", "popupExecuteCommand(TQString)", m_popupPath.path);
accept();
break;
case AddMenuToDesktop: {
accept();
- KDesktopFile *df = new KDesktopFile( newDesktopFile(KURL("programs:/"+m_popupPath.menuPath),TDEGlobalSettings::desktopPath()));
+ TDEDesktopFile *df = new TDEDesktopFile( newDesktopFile(KURL("programs:/"+m_popupPath.menuPath),TDEGlobalSettings::desktopPath()));
df->writeEntry( "Icon", m_popupPath.icon );
df->writePathEntry( "URL", "programs:/"+m_popupPath.menuPath );
df->writeEntry( "Name", m_popupPath.title );
@@ -3005,7 +3010,7 @@ void KMenu::slotContextMenu(int selected)
case AddMenuToPanel:
accept();
ds << "foo" << m_popupPath.menuPath;
- kapp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba);
+ tdeApp->dcopClient()->send("kicker", "Panel", "addServiceMenuButton(TQString,TQString)", ba);
break;
case AddToFavorites:
@@ -3020,14 +3025,14 @@ void KMenu::slotContextMenu(int selected)
TQStringList::Iterator it;
for (it = favs.begin(); it != favs.end(); ++it) {
if ((*it)[0]=='/') {
- KDesktopFile df((*it),true);
+ TDEDesktopFile df((*it),true);
if (df.readURL().replace("file://",TQString())==m_popupPath.path)
break;
}
}
if (it==favs.end()) {
TQString file = KickerLib::newDesktopFile(m_popupPath.path);
- KDesktopFile df(file);
+ TDEDesktopFile df(file);
df.writeEntry("Encoding", "UTF-8");
df.writeEntry("Type","Link");
df.writeEntry("Name", m_popupPath.title);
@@ -3062,7 +3067,7 @@ void KMenu::slotContextMenu(int selected)
else {
for (TQStringList::Iterator it = favs.begin(); it != favs.end(); ++it) {
if ((*it)[0]=='/') {
- KDesktopFile df((*it),true);
+ TDEDesktopFile df((*it),true);
if (df.readURL().replace("file://",TQString())==m_popupPath.path) {
TQFile::remove((*it));
favs.erase(it);
@@ -3238,7 +3243,7 @@ void KMenu::notifyServiceStarted(KService::Ptr service)
TQDataStream stream(params, IO_WriteOnly);
stream << "minicli" << service->storageId();
kdDebug() << "minicli appLauncher dcop signal: " << service->storageId() << endl;
- TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
+ tdeApp->dcopClient()->emitDCOPSignal("appLauncher",
"serviceStartedByStorageId(TQString,TQString)", params);
}
@@ -3306,7 +3311,7 @@ void KMenu::searchActionClicked(TQListViewItem* item)
list << "kurisearchfilter" << "kuriikwsfilter";
if( !KURIFilter::self()->filterURI(data, list) ) {
- KDesktopFile file("searchproviders/google.desktop", true, "services");
+ TDEDesktopFile file("searchproviders/google.desktop", true, "services");
data.setData(file.readEntry("Query").replace("\\{@}", m_kcommand->currentText()));
}
@@ -3415,7 +3420,7 @@ void KMenu::slotFavoritesMoved( TQListViewItem* item, TQListViewItem* /*afterFir
{
if ((*it)[0]=='/')
{
- KDesktopFile df((*it),true);
+ TDEDesktopFile df((*it),true);
if (df.readURL().replace("file://",TQString())==kitem->path())
{
addFav = *it;
@@ -3440,7 +3445,7 @@ void KMenu::slotFavoritesMoved( TQListViewItem* item, TQListViewItem* /*afterFir
{
if ((*it)[0]=='/' && !kafterNow->service())
{
- KDesktopFile df((*it),true);
+ TDEDesktopFile df((*it),true);
if (df.readURL().replace("file://",TQString())==kafterNow->path())
{
kdDebug() << "insert after " << kafterNow->path() << endl;
@@ -3564,7 +3569,7 @@ bool KMenu::ensureServiceRunning(const TQString & service)
TQDataStream arg(data, IO_WriteOnly);
arg << service << URLs;
- if ( !kapp->dcopClient()->call( "tdelauncher", "tdelauncher", "start_service_by_desktop_name(TQString,TQStringList)",
+ if ( !tdeApp->dcopClient()->call( "tdelauncher", "tdelauncher", "start_service_by_desktop_name(TQString,TQStringList)",
data, replyType, replyData) ) {
tqWarning( "call to tdelauncher failed.");
return false;
@@ -3610,7 +3615,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after )
{
TQString uri = item.m_path;
if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) {
- KDesktopFile df(uri,true);
+ TDEDesktopFile df(uri,true);
uri=df.readURL();
}
@@ -3619,7 +3624,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after )
{
if ((*it)[0]=='/')
{
- KDesktopFile df((*it),true);
+ TDEDesktopFile df((*it),true);
if (df.readURL().replace("file://",TQString())==uri)
break;
}
@@ -3627,7 +3632,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after )
if (it==favs.end())
{
TQString file = KickerLib::newDesktopFile(uri);
- KDesktopFile df(file);
+ TDEDesktopFile df(file);
df.writeEntry("Encoding", "UTF-8");
df.writeEntry("Type","Link");
df.writeEntry("Name", item.m_title);
@@ -3661,7 +3666,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after )
{
if ((*it)[0]=='/')
{
- KDesktopFile df((*it),true);
+ TDEDesktopFile df((*it),true);
if (df.readURL().replace("file://",TQString())==text)
break;
}
@@ -3672,7 +3677,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after )
KURL kurl(text);
TQString file = KickerLib::newDesktopFile(text);
- KDesktopFile df(file);
+ TDEDesktopFile df(file);
df.writeEntry("Encoding", "UTF-8");
df.writeEntry("Type","Link");
df.writeEntry("Name", item->name());
@@ -3844,7 +3849,7 @@ void KMenu::runUserCommand()
if ( kicker_screen_number )
appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
- kapp->updateRemoteUserTimestamp( appname );
- kapp->dcopClient()->send( appname, "KDesktopIface",
+ tdeApp->updateRemoteUserTimestamp( appname );
+ tdeApp->dcopClient()->send( appname, "KDesktopIface",
"popupExecuteCommand()", data );
}