summaryrefslogtreecommitdiffstats
path: root/tdeui/tdeaction.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:04 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:04 -0600
commitd1e0cc99a202cef3306b90b8839a6726e89f201e (patch)
treea0d01a91644fd94aa6da5d8944e052b67461faad /tdeui/tdeaction.h
parent3e3559f2d4f4c4ffa3caa0374928c8a12be29bf3 (diff)
downloadtdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.tar.gz
tdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/tdeaction.h')
-rw-r--r--tdeui/tdeaction.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/tdeui/tdeaction.h b/tdeui/tdeaction.h
index b68ded272..e8adcfff1 100644
--- a/tdeui/tdeaction.h
+++ b/tdeui/tdeaction.h
@@ -23,15 +23,15 @@
*/
//$Id$
-#ifndef __kaction_h__
-#define __kaction_h__
+#ifndef __tdeaction_h__
+#define __tdeaction_h__
#include <tqkeysequence.h>
#include <tqobject.h>
#include <tqvaluelist.h>
#include <tqguardedptr.h>
#include <kguiitem.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
#include <kstdaction.h>
#include <kicontheme.h>
@@ -414,7 +414,7 @@ public:
TQWidget* representative( int index ) const;
int containerCount() const;
/// @since 3.1
- uint kaccelCount() const;
+ uint tdeaccelCount() const;
virtual bool hasIcon() const;
#ifndef KDE_NO_COMPAT
@@ -626,10 +626,10 @@ signals:
private:
void initPrivate( const TQString& text, const TDEShortcut& cut,
const TQObject* receiver, const char* slot );
- TDEAccel* kaccelCurrent();
+ TDEAccel* tdeaccelCurrent();
bool initShortcut( const TDEShortcut& );
void plugShortcut();
- bool updateTDEAccelShortcut( TDEAccel* kaccel );
+ bool updateTDEAccelShortcut( TDEAccel* tdeaccel );
void insertTDEAccel( TDEAccel* );
/** @internal To be used exclusively by TDEActionCollection::removeWidget(). */
void removeTDEAccel( TDEAccel* );
@@ -670,7 +670,7 @@ private:
TDEActionPrivate* const d;
};
-#include <kactioncollection.h>
-#include <kactionclasses.h>
+#include <tdeactioncollection.h>
+#include <tdeactionclasses.h>
#endif