summaryrefslogtreecommitdiffstats
path: root/extra/kde341
diff options
context:
space:
mode:
Diffstat (limited to 'extra/kde341')
-rw-r--r--extra/kde341/kaccelaction.h144
-rw-r--r--extra/kde341/kaccelbase.h64
-rw-r--r--extra/kde341/konsole_part.h30
-rw-r--r--extra/kde341/kpanelmenu.h2
-rw-r--r--extra/kde341/krecentdirs.h2
-rw-r--r--extra/kde341/ktoolbarbutton.h28
-rw-r--r--extra/kde341/selectdialog.h4
7 files changed, 137 insertions, 137 deletions
diff --git a/extra/kde341/kaccelaction.h b/extra/kde341/kaccelaction.h
index 51a9076..963ce24 100644
--- a/extra/kde341/kaccelaction.h
+++ b/extra/kde341/kaccelaction.h
@@ -27,7 +27,7 @@
#include <kshortcut.h>
-class KAccelBase;
+class TDEAccelBase;
class TQObject;
class TDEConfig;
@@ -35,27 +35,27 @@ class TDEConfigBase;
/**
* @internal
- * A KAccelAction prepresents an action that can be executed using
- * an accelerator key. Each KAccelAction has a name, a label, a
- * "What's this" string and a KShortcut. The user can configure and
+ * A TDEAccelAction prepresents an action that can be executed using
+ * an accelerator key. Each TDEAccelAction has a name, a label, a
+ * "What's this" string and a TDEShortcut. The user can configure and
* enable/disable them using KKeyDialog.
*
* \code
- * 1) KAccelAction = "Run Command"
+ * 1) TDEAccelAction = "Run Command"
* Default3 = "Alt+F2"
* Default4 = "Meta+Enter;Alt+F2"
- * 1) KShortcut = "Meta+Enter"
+ * 1) TDEShortcut = "Meta+Enter"
* 1) KKeySequence = "Meta+Enter"
* 1) KKey = "Meta+Enter"
* 1) Meta+Enter
* 2) Meta+Keypad_Enter
- * 2) KShortcut = "Alt+F2"
+ * 2) TDEShortcut = "Alt+F2"
* 1) KKeySequence = "Alt+F2"
* 1) Alt+F2
- * 2) KAccelAction = "Something"
+ * 2) TDEAccelAction = "Something"
* Default3 = ""
* Default4 = ""
- * 1) KShortcut = "Meta+X,Asterisk"
+ * 1) TDEShortcut = "Meta+X,Asterisk"
* 1) KKeySequence = "Meta+X,Asterisk"
* 1) KKey = "Meta+X"
* 1) Meta+X
@@ -64,27 +64,27 @@ class TDEConfigBase;
* 2) Keypad_Asterisk
* \endcode
* @short An accelerator action
- * @see KAccel
+ * @see TDEAccel
* @see TDEGlobalAccel
* @see KKeyChooser
* @see KKeyDialog
*/
-class TDECORE_EXPORT KAccelAction
+class TDECORE_EXPORT TDEAccelAction
{
public:
/**
- * Creates an empty KAccelAction.
+ * Creates an empty TDEAccelAction.
* @see clear()
*/
- KAccelAction();
+ TDEAccelAction();
/**
* Copy constructor.
*/
- KAccelAction( const KAccelAction& );
+ TDEAccelAction( const TDEAccelAction& );
/**
- * Creates a new KAccelAction.
+ * Creates a new TDEAccelAction.
* @param sName the name of the accelerator
* @param sLabel the label of the accelerator (i18n!)
* @param sWhatsThis the What's This text (18n!)
@@ -97,11 +97,11 @@ class TDECORE_EXPORT KAccelAction
* @param bConfigurable if true the user can configure the shortcut
* @param bEnabled true if the accelerator should be enabled
*/
- KAccelAction( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
- const KShortcut& cutDef3, const KShortcut& cutDef4,
+ TDEAccelAction( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
+ const TDEShortcut& cutDef3, const TDEShortcut& cutDef4,
const TQObject* pObjSlot, const char* psMethodSlot,
bool bConfigurable, bool bEnabled );
- ~KAccelAction();
+ ~TDEAccelAction();
/**
* Clears the accelerator.
@@ -109,7 +109,7 @@ class TDECORE_EXPORT KAccelAction
void clear();
/**
- * Re-initialized the KAccelAction.
+ * Re-initialized the TDEAccelAction.
* @param sName the name of the accelerator
* @param sLabel the label of the accelerator (i18n!)
* @param sWhatsThis the What's This text (18n!)
@@ -124,14 +124,14 @@ class TDECORE_EXPORT KAccelAction
* @return true if successful, false otherwise
*/
bool init( const TQString& sName, const TQString& sLabel, const TQString& sWhatsThis,
- const KShortcut& cutDef3, const KShortcut& cutDef4,
+ const TDEShortcut& cutDef3, const TDEShortcut& cutDef4,
const TQObject* pObjSlot, const char* psMethodSlot,
bool bConfigurable, bool bEnabled );
/**
- * Copies this KAccelAction.
+ * Copies this TDEAccelAction.
*/
- KAccelAction& operator=( const KAccelAction& );
+ TDEAccelAction& operator=( const TDEAccelAction& );
/**
* Returns the name of the accelerator action.
@@ -156,10 +156,10 @@ class TDECORE_EXPORT KAccelAction
/**
* The shortcut that is actually used (may be used configured).
- * @return the shortcut of the KAccelAction, can be null if not set
+ * @return the shortcut of the TDEAccelAction, can be null if not set
* @see shortcutDefault()
*/
- const KShortcut& shortcut() const { return m_cut; }
+ const TDEShortcut& shortcut() const { return m_cut; }
/**
* The default shortcut for this system.
@@ -168,7 +168,7 @@ class TDECORE_EXPORT KAccelAction
* @see shortcutDefault3()
* @see shortcutDefault4()
*/
- const KShortcut& shortcutDefault() const;
+ const TDEShortcut& shortcutDefault() const;
/**
* The default shortcut for 3 modifier systems.
@@ -178,7 +178,7 @@ class TDECORE_EXPORT KAccelAction
* @see shortcutDefault4()
* @see useFourModifierKeys()
*/
- const KShortcut& shortcutDefault3() const { return m_cutDefault3; }
+ const TDEShortcut& shortcutDefault3() const { return m_cutDefault3; }
/**
* The default shortcut for 4 modifier systems.
@@ -188,7 +188,7 @@ class TDECORE_EXPORT KAccelAction
* @see shortcutDefault3()
* @see useFourModifierKeys()
*/
- const KShortcut& shortcutDefault4() const { return m_cutDefault4; }
+ const TDEShortcut& shortcutDefault4() const { return m_cutDefault4; }
/**
* Returns the receiver of signals.
@@ -237,7 +237,7 @@ class TDECORE_EXPORT KAccelAction
* @param rgCuts the shortcut to set
* @return true if successful, false otherwise
*/
- bool setShortcut( const KShortcut& rgCuts );
+ bool setShortcut( const TDEShortcut& rgCuts );
/**
* Sets the slot of the accelerator action.
@@ -284,14 +284,14 @@ class TDECORE_EXPORT KAccelAction
* @param i the position of the sequence
* @param keySeq the new new sequence
* @return true if successful, false otherwise
- * @see KShortcut::setSeq()
+ * @see TDEShortcut::setSeq()
*/
bool setKeySequence( uint i, const KKeySequence &keySeq );
/**
* Clears the action's shortcut. It will not contain any sequences after
* calling this method.
- * @see KShortcut::clear()
+ * @see TDEShortcut::clear()
*/
void clearShortcut();
@@ -299,14 +299,14 @@ class TDECORE_EXPORT KAccelAction
* Checks whether the action's shortcut contains the given key sequence.
* @param keySeq the key sequence to check
* @return true if the shortcut contains the given sequence
- * @see KShortcut::contains()
+ * @see TDEShortcut::contains()
*/
bool contains( const KKeySequence &keySeq );
/**
* Returns the string representation of the action's shortcut.
* @return the string representation of the action's shortcut.
- * @see KShortcut::toString()
+ * @see TDEShortcut::toString()
*/
TQString toString() const;
@@ -332,8 +332,8 @@ class TDECORE_EXPORT KAccelAction
TQString m_sName,
m_sLabel,
m_sWhatsThis;
- KShortcut m_cut;
- KShortcut m_cutDefault3, m_cutDefault4;
+ TDEShortcut m_cut;
+ TDEShortcut m_cutDefault3, m_cutDefault4;
const TQObject* m_pObjSlot;
const char* m_psMethodSlot;
bool m_bConfigurable,
@@ -346,36 +346,36 @@ class TDECORE_EXPORT KAccelAction
private:
static int g_bUseFourModifierKeys;
- class KAccelActionPrivate* d;
+ class TDEAccelActionPrivate* d;
- friend class KAccelActions;
- friend class KAccelBase;
+ friend class TDEAccelActions;
+ friend class TDEAccelBase;
};
//---------------------------------------------------------------------
-// KAccelActions
+// TDEAccelActions
//---------------------------------------------------------------------
/**
* @internal
- * This class represents a collection of KAccelAction objects.
+ * This class represents a collection of TDEAccelAction objects.
*
* @short A collection of accelerator actions
- * @see KAccelAction
+ * @see TDEAccelAction
*/
-class TDECORE_EXPORT KAccelActions
+class TDECORE_EXPORT TDEAccelActions
{
public:
/**
- * Creates a new, empty KAccelActions object.
+ * Creates a new, empty TDEAccelActions object.
*/
- KAccelActions();
+ TDEAccelActions();
/**
* Copy constructor (deep copy).
*/
- KAccelActions( const KAccelActions& );
- virtual ~KAccelActions();
+ TDEAccelActions( const TDEAccelActions& );
+ virtual ~TDEAccelActions();
/**
* Removes all items from this collection.
@@ -388,7 +388,7 @@ class TDECORE_EXPORT KAccelActions
* @param actions the actions to copy
* @return true if successful, false otherwise
*/
- bool init( const KAccelActions &actions );
+ bool init( const TDEAccelActions &actions );
/**
* Loads the actions from the given configuration file.
@@ -405,7 +405,7 @@ class TDECORE_EXPORT KAccelActions
* @param shortcuts the collection that contains the new
* shortcuts
*/
- void updateShortcuts( KAccelActions &shortcuts );
+ void updateShortcuts( TDEAccelActions &shortcuts );
/**
* Retrieves the index of the action with the given name.
@@ -418,63 +418,63 @@ class TDECORE_EXPORT KAccelActions
* Returns the action with the given @p index.
* @param index the index of an action. You must not
* use an index that is too high.
- * @return the KAccelAction with the given index
+ * @return the TDEAccelAction with the given index
* @see count()
*/
- KAccelAction* actionPtr( uint index );
+ TDEAccelAction* actionPtr( uint index );
/**
* Returns the action with the given @p index.
* @param index the index of an action. You must not
* use an index that is too high.
- * @return the KAccelAction with the given index
+ * @return the TDEAccelAction with the given index
* @see count()
*/
- const KAccelAction* actionPtr( uint index ) const;
+ const TDEAccelAction* actionPtr( uint index ) const;
/**
* Returns the action with the given name.
* @param aAction the name of the action to search
- * @return the KAccelAction with the given name, or 0
+ * @return the TDEAccelAction with the given name, or 0
* if not found
*/
- KAccelAction* actionPtr( const TQString& sAction );
+ TDEAccelAction* actionPtr( const TQString& sAction );
/**
* Returns the action with the given name.
* @param aAction the name of the action to search
- * @return the KAccelAction with the given name, or 0
+ * @return the TDEAccelAction with the given name, or 0
* if not found
*/
- const KAccelAction* actionPtr( const TQString& sAction ) const;
+ const TDEAccelAction* actionPtr( const TQString& sAction ) const;
/**
* Returns the action with the given key sequence.
* @param cut the sequence to search for
- * @return the KAccelAction with the given sequence, or 0
+ * @return the TDEAccelAction with the given sequence, or 0
* if not found
*/
- KAccelAction* actionPtr( KKeySequence cut );
+ TDEAccelAction* actionPtr( KKeySequence cut );
/**
* Returns the action with the given @p index.
* @param index the index of an action. You must not
* use an index that is too high.
- * @return the KAccelAction with the given index
+ * @return the TDEAccelAction with the given index
* @see actionPtr()
* @see count()
*/
- KAccelAction& operator []( uint index );
+ TDEAccelAction& operator []( uint index );
/**
* Returns the action with the given @p index.
* @param index the index of an action. You must not
* use an index that is too high.
- * @return the KAccelAction with the given index
+ * @return the TDEAccelAction with the given index
* @see actionPtr()
* @see count()
*/
- const KAccelAction& operator []( uint index ) const;
+ const TDEAccelAction& operator []( uint index ) const;
/**
* Inserts an action into the collection.
@@ -491,8 +491,8 @@ class TDECORE_EXPORT KAccelActions
* @param bEnabled true if the accelerator should be enabled
* @return the new action
*/
- KAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
- const KShortcut& rgCutDefaults3, const KShortcut& rgCutDefaults4,
+ TDEAccelAction* insert( const TQString& sAction, const TQString& sLabel, const TQString& sWhatsThis,
+ const TDEShortcut& rgCutDefaults3, const TDEShortcut& rgCutDefaults4,
const TQObject* pObjSlot = 0, const char* psMethodSlot = 0,
bool bConfigurable = true, bool bEnabled = true );
@@ -502,7 +502,7 @@ class TDECORE_EXPORT KAccelActions
* @param sLabel the label of the accelerator (i18n!)
* @return the new action
*/
- KAccelAction* insert( const TQString& sName, const TQString& sLabel );
+ TDEAccelAction* insert( const TQString& sName, const TQString& sLabel );
/**
* Removes the given action.
@@ -544,21 +544,21 @@ class TDECORE_EXPORT KAccelActions
uint count() const;
protected:
- KAccelBase* m_pKAccelBase;
- KAccelAction** m_prgActions;
+ TDEAccelBase* m_pTDEAccelBase;
+ TDEAccelAction** m_prgActions;
uint m_nSizeAllocated, m_nSize;
void resize( uint );
- void insertPtr( KAccelAction* );
+ void insertPtr( TDEAccelAction* );
private:
- class KAccelActionsPrivate* d;
+ class TDEAccelActionsPrivate* d;
- KAccelActions( KAccelBase* );
- void initPrivate( KAccelBase* );
- KAccelActions& operator =( KAccelActions& );
+ TDEAccelActions( TDEAccelBase* );
+ void initPrivate( TDEAccelBase* );
+ TDEAccelActions& operator =( TDEAccelActions& );
- friend class KAccelBase;
+ friend class TDEAccelBase;
};
#endif // _KACCELACTION_H
diff --git a/extra/kde341/kaccelbase.h b/extra/kde341/kaccelbase.h
index 861ec68..00ab632 100644
--- a/extra/kde341/kaccelbase.h
+++ b/extra/kde341/kaccelbase.h
@@ -42,7 +42,7 @@ class TQWidget;
* key bindings through application configuration files or through the
* KKeyChooser GUI.
*
- * A KAccel contains a list of accelerator items. Each accelerator item
+ * A TDEAccel contains a list of accelerator items. Each accelerator item
* consists of an action name and a keyboard code combined with modifiers
* (Shift, Ctrl and Alt.)
*
@@ -55,7 +55,7 @@ class TQWidget;
* connected. Accelerator items can be connected so that a key will activate
* two different slots.
*
- * A KAccel object handles key events sent to its parent widget and to all
+ * A TDEAccel object handles key events sent to its parent widget and to all
* children of this parent widget.
*
* Key binding reconfiguration during run time can be prevented by specifying
@@ -74,33 +74,33 @@ class TQWidget;
* The translated first argument for insertItem() is used only
* in the configuration dialog.
*\code
- * KAccel *a = new KAccel( myWindow );
+ * TDEAccel *a = new TDEAccel( myWindow );
* // Insert an action "Scroll Up" which is associated with the "Up" key:
* a->insertItem( i18n("Scroll Up"), "Scroll Up", "Up" );
* // Insert an action "Scroll Down" which is not associated with any key:
* a->insertItem( i18n("Scroll Down"), "Scroll Down", 0);
* a->connectItem( "Scroll up", myWindow, SLOT( scrollUp() ) );
- * // a->insertStdItem( KStdAccel::Print ); //not necessary, since it
+ * // a->insertStdItem( TDEStdAccel::Print ); //not necessary, since it
* // is done automatially with the
* // connect below!
- * a->connectItem(KStdAccel::Print, myWindow, SLOT( printDoc() ) );
+ * a->connectItem(TDEStdAccel::Print, myWindow, SLOT( printDoc() ) );
*
* a->readSettings();
*\endcode
*
* If a shortcut has a menu entry as well, you could insert them like
- * this. The example is again the KStdAccel::Print from above.
+ * this. The example is again the TDEStdAccel::Print from above.
*
* \code
* int id;
* id = popup->insertItem("&Print",this, SLOT(printDoc()));
- * a->changeMenuAccel(popup, id, KStdAccel::Print );
+ * a->changeMenuAccel(popup, id, TDEStdAccel::Print );
* \endcode
*
* If you want a somewhat "exotic" name for your standard print action, like
* id = popup->insertItem(i18n("Print &Document"),this, SLOT(printDoc()));
* it might be a good idea to insert the standard action before as
- * a->insertStdItem( KStdAccel::Print, i18n("Print Document") )
+ * a->insertStdItem( TDEStdAccel::Print, i18n("Print Document") )
* as well, so that the user can easily find the corresponding function.
*
* This technique works for other actions as well. Your "scroll up" function
@@ -118,23 +118,23 @@ class TQWidget;
* @short Configurable key binding support.
*/
-class TDECORE_EXPORT KAccelBase
+class TDECORE_EXPORT TDEAccelBase
{
public:
enum Init { QT_KEYS = 0x00, NATIVE_KEYS = 0x01 };
enum Signal { KEYCODE_CHANGED };
- KAccelBase( int fInitCode );
- virtual ~KAccelBase();
+ TDEAccelBase( int fInitCode );
+ virtual ~TDEAccelBase();
uint actionCount() const;
- KAccelActions& actions();
+ TDEAccelActions& actions();
bool isEnabled() const;
- KAccelAction* actionPtr( const TQString& sAction );
- const KAccelAction* actionPtr( const TQString& sAction ) const;
- KAccelAction* actionPtr( const KKey& key );
- KAccelAction* actionPtr( const KKeyServer::Key& key );
+ TDEAccelAction* actionPtr( const TQString& sAction );
+ const TDEAccelAction* actionPtr( const TQString& sAction ) const;
+ TDEAccelAction* actionPtr( const KKey& key );
+ TDEAccelAction* actionPtr( const KKeyServer::Key& key );
const TQString& configGroup() const { return m_sConfigGroup; }
void setConfigGroup( const TQString& group );
@@ -147,10 +147,10 @@ class TDECORE_EXPORT KAccelBase
// Procedures for manipulating Actions.
//void clearActions();
- KAccelAction* insert( const TQString& sName, const TQString& sDesc );
- KAccelAction* insert(
+ TDEAccelAction* insert( const TQString& sName, const TQString& sDesc );
+ TDEAccelAction* insert(
const TQString& sAction, const TQString& sDesc, const TQString& sHelp,
- const KShortcut& rgCutDefaults3, const KShortcut& rgCutDefaults4,
+ const TDEShortcut& rgCutDefaults3, const TDEShortcut& rgCutDefaults4,
const TQObject* pObjSlot, const char* psMethodSlot,
bool bConfigurable = true, bool bEnabled = true );
bool remove( const TQString& sAction );
@@ -158,7 +158,7 @@ class TDECORE_EXPORT KAccelBase
bool updateConnections();
- bool setShortcut( const TQString& sAction, const KShortcut& cut );
+ bool setShortcut( const TQString& sAction, const TDEShortcut& cut );
// Modify individual Action sub-items
bool setActionEnabled( const TQString& sAction, bool bEnable );
@@ -184,46 +184,46 @@ class TDECORE_EXPORT KAccelBase
// Protected methods
protected:
- void slotRemoveAction( KAccelAction* );
+ void slotRemoveAction( TDEAccelAction* );
struct X;
void createKeyList( TQValueVector<struct X>& rgKeys );
- bool insertConnection( KAccelAction* );
- bool removeConnection( KAccelAction* );
+ bool insertConnection( TDEAccelAction* );
+ bool removeConnection( TDEAccelAction* );
virtual bool emitSignal( Signal ) = 0;
- virtual bool connectKey( KAccelAction&, const KKeyServer::Key& ) = 0;
+ virtual bool connectKey( TDEAccelAction&, const KKeyServer::Key& ) = 0;
virtual bool connectKey( const KKeyServer::Key& ) = 0;
- virtual bool disconnectKey( KAccelAction&, const KKeyServer::Key& ) = 0;
+ virtual bool disconnectKey( TDEAccelAction&, const KKeyServer::Key& ) = 0;
virtual bool disconnectKey( const KKeyServer::Key& ) = 0;
protected:
struct ActionInfo
{
- KAccelAction* pAction;
+ TDEAccelAction* pAction;
uint iSeq, iVariation;
//ActionInfo* pInfoNext; // nil if only one action uses this key.
ActionInfo() { pAction = 0; iSeq = 0xffff; iVariation = 0xffff; }
- ActionInfo( KAccelAction* _pAction, uint _iSeq, uint _iVariation )
+ ActionInfo( TDEAccelAction* _pAction, uint _iSeq, uint _iVariation )
{ pAction = _pAction; iSeq = _iSeq; iVariation = _iVariation; }
};
typedef TQMap<KKeyServer::Key, ActionInfo> KKeyToActionMap;
- KAccelActions m_rgActions;
+ TDEAccelActions m_rgActions;
KKeyToActionMap m_mapKeyToAction;
- TQValueList<KAccelAction*> m_rgActionsNonUnique;
+ TQValueList<TDEAccelAction*> m_rgActionsNonUnique;
bool m_bNativeKeys; // Use native key codes instead of TQt codes
bool m_bEnabled;
bool m_bConfigIsGlobal;
TQString m_sConfigGroup;
bool m_bAutoUpdate;
- KAccelAction* mtemp_pActionRemoving;
+ TDEAccelAction* mtemp_pActionRemoving;
private:
- KAccelBase& operator =( const KAccelBase& );
+ TDEAccelBase& operator =( const TDEAccelBase& );
- friend class KAccelActions;
+ friend class TDEAccelActions;
};
#endif // _KACCELBASE_H
diff --git a/extra/kde341/konsole_part.h b/extra/kde341/konsole_part.h
index 5647257..d6f6290 100644
--- a/extra/kde341/konsole_part.h
+++ b/extra/kde341/konsole_part.h
@@ -36,11 +36,11 @@ class TDEInstance;
class konsoleBrowserExtension;
class TQPushButton;
class TQSpinBox;
-class KPopupMenu;
+class TDEPopupMenu;
class TQCheckBox;
class KRootPixmap;
-class KToggleAction;
-class KSelectAction;
+class TDEToggleAction;
+class TDESelectAction;
namespace KParts { class GUIActivateEvent; }
@@ -142,20 +142,20 @@ signals:
// ColorSchemaList* colors;
KRootPixmap* rootxpm;
- KToggleAction* blinkingCursor;
- KToggleAction* showFrame;
+ TDEToggleAction* blinkingCursor;
+ TDEToggleAction* showFrame;
- KSelectAction* selectBell;
- KSelectAction* selectFont;
- KSelectAction* selectLineSpacing;
- KSelectAction* selectScrollbar;
- KSelectAction* selectSetEncoding;
+ TDESelectAction* selectBell;
+ TDESelectAction* selectFont;
+ TDESelectAction* selectLineSpacing;
+ TDESelectAction* selectScrollbar;
+ TDESelectAction* selectSetEncoding;
- KPopupMenu* m_keytab;
- KPopupMenu* m_schema;
- KPopupMenu* m_signals;
- KPopupMenu* m_options;
- KPopupMenu* m_popupMenu;
+ TDEPopupMenu* m_keytab;
+ TDEPopupMenu* m_schema;
+ TDEPopupMenu* m_signals;
+ TDEPopupMenu* m_options;
+ TDEPopupMenu* m_popupMenu;
TQFont defaultFont;
diff --git a/extra/kde341/kpanelmenu.h b/extra/kde341/kpanelmenu.h
index 2e28010..0c03d6f 100644
--- a/extra/kde341/kpanelmenu.h
+++ b/extra/kde341/kpanelmenu.h
@@ -50,7 +50,7 @@ class KPanelMenuPrivate;
*
* @author The kicker maintainers, Michael Goffioul <[email protected]>
*/
-class TDEUI_EXPORT KPanelMenu : public KPopupMenu
+class TDEUI_EXPORT KPanelMenu : public TDEPopupMenu
{
Q_OBJECT
diff --git a/extra/kde341/krecentdirs.h b/extra/kde341/krecentdirs.h
index 774655e..cc9be16 100644
--- a/extra/kde341/krecentdirs.h
+++ b/extra/kde341/krecentdirs.h
@@ -47,7 +47,7 @@
* a single ':' the file-class is specific to the current application.
* If the file-class starts with '::' it is global to all applications.
*/
-class TDEIO_EXPORT KRecentDirs
+class TDEIO_EXPORT TDERecentDirs
{
public:
/**
diff --git a/extra/kde341/ktoolbarbutton.h b/extra/kde341/ktoolbarbutton.h
index ac6789a..f035feb 100644
--- a/extra/kde341/ktoolbarbutton.h
+++ b/extra/kde341/ktoolbarbutton.h
@@ -29,19 +29,19 @@
#include <tqstring.h>
#include <kglobal.h>
-class KToolBar;
-class KToolBarButtonPrivate;
+class TDEToolBar;
+class TDEToolBarButtonPrivate;
class TDEInstance;
class TQEvent;
class TQPopupMenu;
class TQPainter;
/**
- * A toolbar button. This is used internally by KToolBar, use the
- * KToolBar methods instead.
+ * A toolbar button. This is used internally by TDEToolBar, use the
+ * TDEToolBar methods instead.
* @internal
*/
-class TDEUI_EXPORT KToolBarButton : public TQToolButton
+class TDEUI_EXPORT TDEToolBarButton : public TQToolButton
{
Q_OBJECT
@@ -58,7 +58,7 @@ public:
* @param txt This button's text (in a tooltip or otherwise)
* @param _instance the instance to use for this button
*/
- KToolBarButton(const TQString& icon, int id, TQWidget *parent,
+ TDEToolBarButton(const TQString& icon, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null,
TDEInstance *_instance = TDEGlobal::instance());
@@ -73,7 +73,7 @@ public:
* @param name This button's internal name
* @param txt This button's text (in a tooltip or otherwise)
*/
- KToolBarButton(const TQPixmap& pixmap, int id, TQWidget *parent,
+ TDEToolBarButton(const TQPixmap& pixmap, int id, TQWidget *parent,
const char *name=0L, const TQString &txt=TQString::null);
/**
@@ -82,12 +82,12 @@ public:
* @param parent This button's parent
* @param name This button's internal name
*/
- KToolBarButton(TQWidget *parent=0L, const char *name=0L);
+ TDEToolBarButton(TQWidget *parent=0L, const char *name=0L);
/**
* Standard destructor
*/
- ~KToolBarButton();
+ ~TDEToolBarButton();
#ifndef KDE_NO_COMPAT
/**
@@ -311,19 +311,19 @@ protected slots:
protected:
virtual void virtual_hook( int id, void* data );
private:
- KToolBarButtonPrivate *d;
+ TDEToolBarButtonPrivate *d;
};
/**
-* List of KToolBarButton objects.
+* List of TDEToolBarButton objects.
* @internal
* @version $Id: ktoolbarbutton.h,v 1.39 2004/12/22 14:08:36 faure Exp $
*/
-class TDEUI_EXPORT KToolBarButtonList : public TQIntDict<KToolBarButton>
+class TDEUI_EXPORT TDEToolBarButtonList : public TQIntDict<TDEToolBarButton>
{
public:
- KToolBarButtonList();
- ~KToolBarButtonList() {}
+ TDEToolBarButtonList();
+ ~TDEToolBarButtonList() {}
};
#endif
diff --git a/extra/kde341/selectdialog.h b/extra/kde341/selectdialog.h
index 5900586..563a564 100644
--- a/extra/kde341/selectdialog.h
+++ b/extra/kde341/selectdialog.h
@@ -30,7 +30,7 @@
#include <kdialog.h>
-class KListBox;
+class TDEListBox;
namespace KRES {
@@ -77,7 +77,7 @@ class TDERESOURCES_EXPORT SelectDialog
static Resource *getResource( TQPtrList<Resource> list, TQWidget *parent = 0 );
private:
- KListBox *mResourceId;
+ TDEListBox *mResourceId;
TQMap<int, Resource*> mResourceMap;
};