summaryrefslogtreecommitdiffstats
path: root/kdesktop
diff options
context:
space:
mode:
Diffstat (limited to 'kdesktop')
-rw-r--r--kdesktop/bgmanager.h2
-rw-r--r--kdesktop/desktop.cc12
-rw-r--r--kdesktop/desktop.h4
-rw-r--r--kdesktop/kdiconview.cc34
-rw-r--r--kdesktop/kdiconview.h12
-rw-r--r--kdesktop/klaunchsettings.kcfgc2
-rw-r--r--kdesktop/krootwm.cc74
-rw-r--r--kdesktop/krootwm.h8
-rw-r--r--kdesktop/main.cc2
-rw-r--r--kdesktop/pixmapserver.cc4
-rw-r--r--kdesktop/pixmapserver.h6
-rw-r--r--kdesktop/startupid.cpp6
12 files changed, 83 insertions, 83 deletions
diff --git a/kdesktop/bgmanager.h b/kdesktop/bgmanager.h
index e73337db4..2d29278f7 100644
--- a/kdesktop/bgmanager.h
+++ b/kdesktop/bgmanager.h
@@ -22,7 +22,7 @@
class TDEConfig;
class TQTimer;
class TQPixmap;
-class KPopupMenu;
+class TDEPopupMenu;
class KWinModule;
class KPixmap;
class KVirtualBGRenderer;
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc
index 07fbaf5cd..9ff390ec6 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cc
@@ -62,7 +62,7 @@
#include <kpopupmenu.h>
#include <kapplication.h>
#include <kdirlister.h>
-// Create the equivalent of KAccelBase::connectItem
+// Create the equivalent of TDEAccelBase::connectItem
// and then remove this include and fix reconnects in initRoot() -- ellis
//#include <kaccelbase.h>
@@ -454,8 +454,8 @@ void KDesktop::initConfig()
keys->updateConnections();
}
- KLaunchSettings::self()->readConfig();
- if( !KLaunchSettings::busyCursor() )
+ TDELaunchSettings::self()->readConfig();
+ if( !TDELaunchSettings::busyCursor() )
{
delete startup_id;
startup_id = NULL;
@@ -748,7 +748,7 @@ void KDesktop::toggleShowDesktop()
setShowDesktop(!showDesktopState());
}
-KActionCollection * KDesktop::actionCollection()
+TDEActionCollection * KDesktop::actionCollection()
{
if (!m_pIconView)
return 0;
@@ -929,7 +929,7 @@ void KDesktop::slotSwitchDesktops(int delta)
void KDesktop::handleColorDropEvent(TQDropEvent * e)
{
- KPopupMenu popup;
+ TDEPopupMenu popup;
popup.insertItem(SmallIconSet("colors"),i18n("Set as Primary Background Color"), 1);
popup.insertItem(SmallIconSet("colors"),i18n("Set as Secondary Background Color"), 2);
int result = popup.exec(e->pos());
@@ -946,7 +946,7 @@ void KDesktop::handleColorDropEvent(TQDropEvent * e)
void KDesktop::handleImageDropEvent(TQDropEvent * e)
{
- KPopupMenu popup;
+ TDEPopupMenu popup;
if ( m_pIconView )
popup.insertItem(SmallIconSet("filesave"),i18n("&Save to Desktop..."), 1);
if ( ( m_pIconView && m_pIconView->maySetWallpaper() ) || m_pRootWidget )
diff --git a/kdesktop/desktop.h b/kdesktop/desktop.h
index 3aa81241c..0620dcd4d 100644
--- a/kdesktop/desktop.h
+++ b/kdesktop/desktop.h
@@ -39,7 +39,7 @@ class TQTimer;
class StartupId;
class KDIconView;
class Minicli;
-class KActionCollection;
+class TDEActionCollection;
class KRootWidget : public TQObject
{
@@ -99,7 +99,7 @@ public:
KWinModule* twinModule() const { return m_pKwinmodule; }
// The action collection of the active widget
- KActionCollection *actionCollection();
+ TDEActionCollection *actionCollection();
// The URL (for the File/New menu)
KURL url() const;
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index ba772c39d..d80af8fe7 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -418,35 +418,35 @@ void KDIconView::createActions()
{
if (m_bEditableDesktopIcons)
{
- KAction *undo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), &m_actionCollection, "undo" );
+ 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 & ) ) );
undo->setEnabled( KonqUndoManager::self()->undoAvailable() );
- KAction* paCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( slotCut() ), &m_actionCollection, "cut" );
- KShortcut cutShortCut = paCut->shortcut();
+ TDEAction* paCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_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" );
- KAction *pasteTo = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPopupPasteTo() ), &m_actionCollection, "pasteto" );
+ TDEAction *pasteTo = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPopupPasteTo() ), &m_actionCollection, "pasteto" );
pasteTo->setEnabled( false ); // only enabled during popupMenu()
- KShortcut reloadShortcut = KStdAccel::shortcut(KStdAccel::Reload);
- new KAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( refreshIcons() ), &m_actionCollection, "reload" );
+ TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload);
+ new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, TQT_TQOBJECT(this), TQT_SLOT( refreshIcons() ), &m_actionCollection, "reload" );
- (void) new KAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, TQT_TQOBJECT(this), TQT_SLOT( renameSelectedItem() ), &m_actionCollection, "rename" );
- (void) new KAction( i18n( "&Properties" ), ALT+Key_Return, TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), &m_actionCollection, "properties" );
- KAction* trash = new KAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, &m_actionCollection, "trash" );
- connect( trash, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ),
- this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, TQt::ButtonState ) ) );
+ (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" );
+ 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 ) ) );
TDEConfig config("kdeglobals", true, false);
config.setGroup( "KDE" );
- (void) new KAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), &m_actionCollection, "del" );
+ (void) new TDEAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotDelete() ), &m_actionCollection, "del" );
// Initial state of the actions (cut/copy/paste/...)
slotSelectionChanged();
@@ -870,12 +870,12 @@ bool KDIconView::deleteGlobalDesktopFiles()
return !itemsLeft;
}
-void KDIconView::slotTrashActivated( KAction::ActivationReason reason, TQt::ButtonState state )
+void KDIconView::slotTrashActivated( TDEAction::ActivationReason reason, TQt::ButtonState state )
{
if (deleteGlobalDesktopFiles())
return; // All items deleted
- if ( reason == KAction::PopupMenuActivation && ( state & TQt::ShiftButton ) )
+ if ( reason == TDEAction::PopupMenuActivation && ( state & TQt::ShiftButton ) )
KonqOperations::del(this, KonqOperations::DEL, selectedUrls());
else
KonqOperations::del(this, KonqOperations::TRASH, selectedUrls());
@@ -899,7 +899,7 @@ void KDIconView::popupMenu( const TQPoint &_global, const KFileItemList& _items
if ( _items.count() == 1 )
m_popupURL = _items.getFirst()->url();
- KAction* pasteTo = m_actionCollection.action( "pasteto" );
+ TDEAction* pasteTo = m_actionCollection.action( "pasteto" );
if (pasteTo)
pasteTo->setEnabled( m_actionCollection.action( "paste" )->isEnabled() );
@@ -945,7 +945,7 @@ void KDIconView::slotEnableAction( const char * name, bool enabled )
if ( sName == "properties" || sName == "editMimeType" )
return;
- KAction * act = m_actionCollection.action( sName.data() );
+ TDEAction * act = m_actionCollection.action( sName.data() );
if (act)
act->setEnabled( enabled );
}
@@ -1409,7 +1409,7 @@ void KDIconView::slotClipboardDataChanged()
TQString actionText = TDEIO::pasteActionText();
bool paste = !actionText.isEmpty();
if ( paste ) {
- KAction* pasteAction = m_actionCollection.action( "paste" );
+ TDEAction* pasteAction = m_actionCollection.action( "paste" );
if ( pasteAction )
pasteAction->setText( actionText );
}
diff --git a/kdesktop/kdiconview.h b/kdesktop/kdiconview.h
index c9feecaf7..7d8ff1527 100644
--- a/kdesktop/kdiconview.h
+++ b/kdesktop/kdiconview.h
@@ -33,7 +33,7 @@
class KDirLister;
class KonqSettings;
class KSimpleConfig;
-class KAccel;
+class TDEAccel;
class KShadowEngine;
class KDesktopShadowSettings;
@@ -60,7 +60,7 @@ public:
*/
void start();
- KActionCollection *actionCollection() { return &m_actionCollection; }
+ TDEActionCollection *actionCollection() { return &m_actionCollection; }
enum SortCriterion {
NameCaseSensitive = 0, NameCaseInsensitive, Size, Type, Date };
@@ -138,7 +138,7 @@ protected slots:
// slots connected to the popupmenu (actions)
void slotCut();
void slotCopy();
- void slotTrashActivated( KAction::ActivationReason reason, TQt::ButtonState state );
+ void slotTrashActivated( TDEAction::ActivationReason reason, TQt::ButtonState state );
void slotDelete();
void slotPopupPasteTo();
void slotProperties();
@@ -200,10 +200,10 @@ private:
static void readIconPosition(KSimpleConfig *config, int &x, int &y);
/** Our action collection, parent of all our actions */
- KActionCollection m_actionCollection;
+ TDEActionCollection m_actionCollection;
- /** KAccel object, to make the actions shortcuts work */
- KAccel *m_accel;
+ /** TDEAccel object, to make the actions shortcuts work */
+ TDEAccel *m_accel;
bool m_bNeedRepaint;
bool m_bNeedSave;
diff --git a/kdesktop/klaunchsettings.kcfgc b/kdesktop/klaunchsettings.kcfgc
index 0cf4f73eb..4d10d280f 100644
--- a/kdesktop/klaunchsettings.kcfgc
+++ b/kdesktop/klaunchsettings.kcfgc
@@ -1,4 +1,4 @@
File=klaunch.kcfg
-ClassName=KLaunchSettings
+ClassName=TDELaunchSettings
Singleton=true
Mutators=true
diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc
index a263b529c..62bb0e2bc 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cc
@@ -72,7 +72,7 @@ extern TQCString kdesktop_name, kicker_name, twin_name;
KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE)
{
s_rootWm = this;
- m_actionCollection = new KActionCollection(_desktop, this, "KRootWm::m_actionCollection");
+ m_actionCollection = new TDEActionCollection(_desktop, this, "KRootWm::m_actionCollection");
m_pDesktop = _desktop;
m_bDesktopEnabled = (m_pDesktop->iconView() != 0);
customMenu1 = 0;
@@ -92,9 +92,9 @@ KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE)
m_pDesktop->iconView(), TQT_SLOT( slotNewMenuActivated() ) );
}
- if (kapp->authorizeKAction("bookmarks"))
+ if (kapp->authorizeTDEAction("bookmarks"))
{
- bookmarks = new KActionMenu( i18n("Bookmarks"), "bookmark", m_actionCollection, "bookmarks" );
+ bookmarks = new TDEActionMenu( i18n("Bookmarks"), "bookmark", m_actionCollection, "bookmarks" );
// The KBookmarkMenu is needed to fill the Bookmarks menu in the desktop menubar.
bookmarkMenu = new KBookmarkMenu( KonqBookmarkManager::self(), new KBookmarkOwner(),
bookmarks->popupMenu(),
@@ -119,8 +119,8 @@ KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE)
if (m_bDesktopEnabled)
{
// Don't do that! One action in two parent collections means some invalid write
- // during the second ~KActionCollection.
- KAction *action = m_pDesktop->actionCollection()->action( "paste" );
+ // during the second ~TDEActionCollection.
+ TDEAction *action = m_pDesktop->actionCollection()->action( "paste" );
if (action)
m_actionCollection->insert( action );
action = m_pDesktop->actionCollection()->action( "undo" );
@@ -131,79 +131,79 @@ KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE)
if (kapp->authorize("run_command"))
{
- new KAction(i18n("Run Command..."), "run", 0, TQT_TQOBJECT(m_pDesktop), TQT_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
- new KAction(i18n("Open Terminal Here..." ), "terminal", CTRL+Key_T, this, TQT_SLOT( slotOpenTerminal() ),
+ new TDEAction(i18n("Run Command..."), "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() ),
m_actionCollection, "open_terminal" );
}
if (!TDEGlobal::config()->isImmutable())
{
- new KAction(i18n("Configure Desktop..."), "configure", 0, this, TQT_SLOT( slotConfigureDesktop() ),
+ new TDEAction(i18n("Configure Desktop..."), "configure", 0, this, TQT_SLOT( slotConfigureDesktop() ),
m_actionCollection, "configdesktop" );
- new KAction(i18n("Disable Desktop Menu"), 0, this, TQT_SLOT( slotToggleDesktopMenu() ),
+ new TDEAction(i18n("Disable Desktop Menu"), 0, this, TQT_SLOT( slotToggleDesktopMenu() ),
m_actionCollection, "togglemenubar" );
}
- new KAction(i18n("Unclutter Windows"), 0, this, TQT_SLOT( slotUnclutterWindows() ),
+ new TDEAction(i18n("Unclutter Windows"), 0, this, TQT_SLOT( slotUnclutterWindows() ),
m_actionCollection, "unclutter" );
- new KAction(i18n("Cascade Windows"), 0, this, TQT_SLOT( slotCascadeWindows() ),
+ new TDEAction(i18n("Cascade Windows"), 0, this, TQT_SLOT( slotCascadeWindows() ),
m_actionCollection, "cascade" );
// arrange menu actions
if (m_bDesktopEnabled && kapp->authorize("editable_desktop_icons"))
{
- new KAction(i18n("By Name (Case Sensitive)"), 0, this, TQT_SLOT( slotArrangeByNameCS() ),
+ new TDEAction(i18n("By Name (Case Sensitive)"), 0, this, TQT_SLOT( slotArrangeByNameCS() ),
m_actionCollection, "sort_ncs");
- new KAction(i18n("By Name (Case Insensitive)"), 0, this, TQT_SLOT( slotArrangeByNameCI() ),
+ new TDEAction(i18n("By Name (Case Insensitive)"), 0, this, TQT_SLOT( slotArrangeByNameCI() ),
m_actionCollection, "sort_nci");
- new KAction(i18n("By Size"), 0, this, TQT_SLOT( slotArrangeBySize() ),
+ new TDEAction(i18n("By Size"), 0, this, TQT_SLOT( slotArrangeBySize() ),
m_actionCollection, "sort_size");
- new KAction(i18n("By Type"), 0, this, TQT_SLOT( slotArrangeByType() ),
+ new TDEAction(i18n("By Type"), 0, this, TQT_SLOT( slotArrangeByType() ),
m_actionCollection, "sort_type");
- new KAction(i18n("By Date"), 0, this, TQT_SLOT( slotArrangeByDate() ),
+ new TDEAction(i18n("By Date"), 0, this, TQT_SLOT( slotArrangeByDate() ),
m_actionCollection, "sort_date");
- KToggleAction *aSortDirsFirst = new KToggleAction( i18n("Directories First"), 0, m_actionCollection, "sort_directoriesfirst" );
+ TDEToggleAction *aSortDirsFirst = new TDEToggleAction( i18n("Directories First"), 0, m_actionCollection, "sort_directoriesfirst" );
connect( aSortDirsFirst, TQT_SIGNAL( toggled( bool ) ),
this, TQT_SLOT( slotToggleDirFirst( bool ) ) );
- new KAction(i18n("Line Up Horizontally"), 0,
+ new TDEAction(i18n("Line Up Horizontally"), 0,
this, TQT_SLOT( slotLineupIconsHoriz() ),
m_actionCollection, "lineupHoriz" );
- new KAction(i18n("Line Up Vertically"), 0,
+ new TDEAction(i18n("Line Up Vertically"), 0,
this, TQT_SLOT( slotLineupIconsVert() ),
m_actionCollection, "lineupVert" );
- KToggleAction *aAutoAlign = new KToggleAction(i18n("Align to Grid"), 0,
+ TDEToggleAction *aAutoAlign = new TDEToggleAction(i18n("Align to Grid"), 0,
m_actionCollection, "realign" );
connect( aAutoAlign, TQT_SIGNAL( toggled( bool ) ),
this, TQT_SLOT( slotToggleAutoAlign( bool ) ) );
- KToggleAction *aLockIcons = new KToggleAction(i18n("Lock in Place"), 0, m_actionCollection, "lock_icons");
+ TDEToggleAction *aLockIcons = new TDEToggleAction(i18n("Lock in Place"), 0, m_actionCollection, "lock_icons");
connect( aLockIcons, TQT_SIGNAL( toggled( bool ) ),
this, TQT_SLOT( slotToggleLockIcons( bool ) ) );
}
if (m_bDesktopEnabled)
{
- new KAction(i18n("Refresh Desktop"), "desktop", 0, this, TQT_SLOT( slotRefreshDesktop() ),
+ new TDEAction(i18n("Refresh Desktop"), "desktop", 0, this, TQT_SLOT( slotRefreshDesktop() ),
m_actionCollection, "refresh" );
}
// Icons in sync with kicker
if (kapp->authorize("lock_screen"))
{
- new KAction(i18n("Lock Session"), "lock", 0, this, TQT_SLOT( slotLock() ),
+ new TDEAction(i18n("Lock Session"), "lock", 0, this, TQT_SLOT( slotLock() ),
m_actionCollection, "lock" );
}
if (kapp->authorize("logout"))
{
- new KAction(i18n("Log Out \"%1\"...").arg(KUser().loginName()), "exit", 0,
+ new TDEAction(i18n("Log Out \"%1\"...").arg(KUser().loginName()), "exit", 0,
this, TQT_SLOT( slotLogout() ), m_actionCollection, "logout" );
}
if (kapp->authorize("start_new_session") && DM().isSwitchable())
{
- new KAction(i18n("Start New Session"), "fork", 0, this,
+ new TDEAction(i18n("Start New Session"), "fork", 0, this,
TQT_SLOT( slotNewSession() ), m_actionCollection, "newsession" );
if (kapp->authorize("lock_screen"))
{
- new KAction(i18n("Lock Current && Start New Session"), "lock", 0, this,
+ new TDEAction(i18n("Lock Current && Start New Session"), "lock", 0, this,
TQT_SLOT( slotLockNNewSession() ), m_actionCollection, "lockNnewsession" );
}
}
@@ -248,14 +248,14 @@ void KRootWm::initConfig()
m_pDesktop->iconView()->setAutoAlign( KDesktopSettings::autoLineUpIcons() );
if ( kapp->authorize( "editable_desktop_icons" ) ) {
m_pDesktop->iconView()->setItemsMovable( !KDesktopSettings::lockIcons() );
- KToggleAction *aLockIcons = static_cast<KToggleAction*>(m_actionCollection->action("lock_icons"));
+ TDEToggleAction *aLockIcons = static_cast<TDEToggleAction*>(m_actionCollection->action("lock_icons"));
if (aLockIcons)
aLockIcons->setChecked( KDesktopSettings::lockIcons() );
}
- KToggleAction *aAutoAlign = static_cast<KToggleAction*>(m_actionCollection->action("realign"));
+ TDEToggleAction *aAutoAlign = static_cast<TDEToggleAction*>(m_actionCollection->action("realign"));
if (aAutoAlign)
aAutoAlign->setChecked( KDesktopSettings::autoLineUpIcons() );
- KToggleAction *aSortDirsFirst = static_cast<KToggleAction*>(m_actionCollection->action("sort_directoriesfirst"));
+ TDEToggleAction *aSortDirsFirst = static_cast<TDEToggleAction*>(m_actionCollection->action("sort_directoriesfirst"));
if (aSortDirsFirst)
aSortDirsFirst->setChecked( KDesktopSettings::sortDirectoriesFirst() );
}
@@ -285,7 +285,7 @@ void KRootWm::buildMenus()
// create Arrange menu
TQPopupMenu *pArrangeMenu = 0;
TQPopupMenu *pLineupMenu = 0;
- KAction *action;
+ TDEAction *action;
help = new KHelpMenu(0, 0, false);
help->menu()->removeItem( KHelpMenu::menuAboutApp );
@@ -437,7 +437,7 @@ void KRootWm::buildMenus()
m_actionCollection->action( "lineupVert" )->plug( pIconOperationsMenu );
pIconOperationsMenu->insertSeparator();
m_actionCollection->action( "realign" )->plug( pIconOperationsMenu );
- KAction *aLockIcons = m_actionCollection->action( "lock_icons" );
+ TDEAction *aLockIcons = m_actionCollection->action( "lock_icons" );
if ( aLockIcons )
aLockIcons->plug( pIconOperationsMenu );
@@ -665,7 +665,7 @@ void KRootWm::slotArrangeByNameCS()
{
if (m_bDesktopEnabled)
{
- bool b = static_cast<KToggleAction *>(m_actionCollection->action("sort_directoriesfirst"))->isChecked();
+ bool b = static_cast<TDEToggleAction *>(m_actionCollection->action("sort_directoriesfirst"))->isChecked();
m_pDesktop->iconView()->rearrangeIcons( KDIconView::NameCaseSensitive, b);
}
}
@@ -674,7 +674,7 @@ void KRootWm::slotArrangeByNameCI()
{
if (m_bDesktopEnabled)
{
- bool b = static_cast<KToggleAction *>(m_actionCollection->action("sort_directoriesfirst"))->isChecked();
+ bool b = static_cast<TDEToggleAction *>(m_actionCollection->action("sort_directoriesfirst"))->isChecked();
m_pDesktop->iconView()->rearrangeIcons( KDIconView::NameCaseInsensitive, b);
}
}
@@ -683,7 +683,7 @@ void KRootWm::slotArrangeBySize()
{
if (m_bDesktopEnabled)
{
- bool b = static_cast<KToggleAction *>(m_actionCollection->action("sort_directoriesfirst"))->isChecked();
+ bool b = static_cast<TDEToggleAction *>(m_actionCollection->action("sort_directoriesfirst"))->isChecked();
m_pDesktop->iconView()->rearrangeIcons( KDIconView::Size, b);
}
}
@@ -692,7 +692,7 @@ void KRootWm::slotArrangeByDate()
{
if (m_bDesktopEnabled)
{
- bool b = static_cast<KToggleAction *>( m_actionCollection->action( "sort_directoriesfirst" ) )->isChecked();
+ bool b = static_cast<TDEToggleAction *>( m_actionCollection->action( "sort_directoriesfirst" ) )->isChecked();
m_pDesktop->iconView()->rearrangeIcons( KDIconView::Date, b );
}
}
@@ -701,7 +701,7 @@ void KRootWm::slotArrangeByType()
{
if (m_bDesktopEnabled)
{
- bool b = static_cast<KToggleAction *>(m_actionCollection->action("sort_directoriesfirst"))->isChecked();
+ bool b = static_cast<TDEToggleAction *>(m_actionCollection->action("sort_directoriesfirst"))->isChecked();
m_pDesktop->iconView()->rearrangeIcons( KDIconView::Type, b);
}
}
@@ -835,7 +835,7 @@ void KRootWm::slotLogout() {
void KRootWm::slotPopulateSessions()
{
- KAction *action;
+ TDEAction *action;
int p;
DM dm;
diff --git a/kdesktop/krootwm.h b/kdesktop/krootwm.h
index 5bccc36c0..dabe5ac23 100644
--- a/kdesktop/krootwm.h
+++ b/kdesktop/krootwm.h
@@ -39,8 +39,8 @@ class KNewMenu;
class KWinModule;
class KBookmarkMenu;
class KHelpMenu;
-class KActionCollection;
-class KActionMenu;
+class TDEActionCollection;
+class TDEActionMenu;
class KWindowListMenu;
enum {
@@ -141,9 +141,9 @@ private:
menuChoice rightButtonChoice;
KNewMenu* menuNew;
- KActionMenu* bookmarks;
+ TDEActionMenu* bookmarks;
KBookmarkMenu* bookmarkMenu;
- KActionCollection * m_actionCollection;
+ TDEActionCollection * m_actionCollection;
TQPoint m_desktopMenuPosition;
void activateMenu( menuChoice choice, const TQPoint& global );
diff --git a/kdesktop/main.cc b/kdesktop/main.cc
index 9f549e54a..5730305c3 100644
--- a/kdesktop/main.cc
+++ b/kdesktop/main.cc
@@ -280,7 +280,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
}
// for the KDE-already-running check in starttde
- KSelectionOwner kde_running( "_KDE_RUNNING", 0 );
+ TDESelectionOwner kde_running( "_KDE_RUNNING", 0 );
kde_running.claim( false );
KDesktop desktop( x_root_hack, wait_for_kded );
diff --git a/kdesktop/pixmapserver.cc b/kdesktop/pixmapserver.cc
index 58389ae56..d8cde0562 100644
--- a/kdesktop/pixmapserver.cc
+++ b/kdesktop/pixmapserver.cc
@@ -72,7 +72,7 @@ void KPixmapServer::add(TQString name, TQPixmap *pm, bool overwrite)
pi.selection = sel;
m_Names[name] = pi;
- KSelectionInode si;
+ TDESelectionInode si;
si.name = name;
si.handle = pm->handle();
m_Selections[sel] = si;
@@ -163,7 +163,7 @@ bool KPixmapServer::x11Event(XEvent *event)
SelectionIterator it = m_Selections.find(sel);
if (it == m_Selections.end())
return false;
- KSelectionInode si = it.data();
+ TDESelectionInode si = it.data();
// Only convert to pixmap
if (ev->target != pixmap)
diff --git a/kdesktop/pixmapserver.h b/kdesktop/pixmapserver.h
index f5c877f17..3084cd0a3 100644
--- a/kdesktop/pixmapserver.h
+++ b/kdesktop/pixmapserver.h
@@ -35,7 +35,7 @@ struct KPixmapData
int refcount;
};
-struct KSelectionInode
+struct TDESelectionInode
{
Qt::HANDLE handle;
TQString name;
@@ -110,12 +110,12 @@ private:
Atom pixmap;
TQMap<TQString,KPixmapInode> m_Names;
- TQMap<Atom,KSelectionInode> m_Selections;
+ TQMap<Atom,TDESelectionInode> m_Selections;
TQMap<HANDLE,KPixmapData> m_Data;
TQMap<Atom,HANDLE> m_Active;
typedef TQMap<TQString,KPixmapInode>::Iterator NameIterator;
- typedef TQMap<Atom,KSelectionInode>::Iterator SelectionIterator;
+ typedef TQMap<Atom,TDESelectionInode>::Iterator SelectionIterator;
typedef TQMap<HANDLE,KPixmapData>::Iterator DataIterator;
typedef TQMap<Atom,HANDLE>::Iterator AtomIterator;
};
diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp
index 2cedadcdf..0572413a8 100644
--- a/kdesktop/startupid.cpp
+++ b/kdesktop/startupid.cpp
@@ -75,9 +75,9 @@ StartupId::~StartupId()
void StartupId::configure()
{
- startup_info.setTimeout( KLaunchSettings::timeout());
- blinking = KLaunchSettings::blinking();
- bouncing = KLaunchSettings::bouncing();
+ startup_info.setTimeout( TDELaunchSettings::timeout());
+ blinking = TDELaunchSettings::blinking();
+ bouncing = TDELaunchSettings::bouncing();
}
void StartupId::gotNewStartup( const TDEStartupInfoId& id_P, const TDEStartupInfoData& data_P )
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 13:18:25 +0000