summaryrefslogtreecommitdiffstats
path: root/khotkeys/shared
diff options
context:
space:
mode:
Diffstat (limited to 'khotkeys/shared')
-rw-r--r--khotkeys/shared/action_data.cpp10
-rw-r--r--khotkeys/shared/action_data.h16
-rw-r--r--khotkeys/shared/actions.h16
-rw-r--r--khotkeys/shared/conditions.h16
-rw-r--r--khotkeys/shared/gestures.h6
-rw-r--r--khotkeys/shared/khlistview.h2
-rw-r--r--khotkeys/shared/khotkeysglobal.h10
-rw-r--r--khotkeys/shared/settings.h2
-rw-r--r--khotkeys/shared/sound.h2
-rw-r--r--khotkeys/shared/soundrecorder.h2
-rw-r--r--khotkeys/shared/triggers.h12
-rw-r--r--khotkeys/shared/voices.h4
-rw-r--r--khotkeys/shared/voicesignature.h2
-rw-r--r--khotkeys/shared/windows.h10
14 files changed, 55 insertions, 55 deletions
diff --git a/khotkeys/shared/action_data.cpp b/khotkeys/shared/action_data.cpp
index 4f481ea59..7993f1dc8 100644
--- a/khotkeys/shared/action_data.cpp
+++ b/khotkeys/shared/action_data.cpp
@@ -295,7 +295,7 @@ Command_url_shortcut_action_data::Command_url_shortcut_action_data( Action_data_
set_trigger( new Shortcut_trigger( this, shortcut_P ));
}
-template<> KDE_EXPORT
+template<> TDE_EXPORT
void Simple_action_data< Shortcut_trigger, Command_url_action >
::cfg_write( TDEConfig& cfg_P ) const
{
@@ -315,7 +315,7 @@ Menuentry_shortcut_action_data::Menuentry_shortcut_action_data( Action_data_grou
set_trigger( new Shortcut_trigger( this, shortcut_P ));
}
-template<> KDE_EXPORT
+template<> TDE_EXPORT
void Simple_action_data< Shortcut_trigger, Menuentry_action >
::cfg_write( TDEConfig& cfg_P ) const
{
@@ -325,7 +325,7 @@ void Simple_action_data< Shortcut_trigger, Menuentry_action >
// Dcop_shortcut_action_data
-template<> KDE_EXPORT
+template<> TDE_EXPORT
void Simple_action_data< Shortcut_trigger, Dcop_action >
::cfg_write( TDEConfig& cfg_P ) const
{
@@ -335,7 +335,7 @@ void Simple_action_data< Shortcut_trigger, Dcop_action >
// Keyboard_input_shortcut_action_data
-template<> KDE_EXPORT
+template<> TDE_EXPORT
void Simple_action_data< Shortcut_trigger, Keyboard_input_action >
::cfg_write( TDEConfig& cfg_P ) const
{
@@ -345,7 +345,7 @@ void Simple_action_data< Shortcut_trigger, Keyboard_input_action >
// Activate_window_shortcut_action_data
-template<> KDE_EXPORT
+template<> TDE_EXPORT
void Simple_action_data< Shortcut_trigger, Activate_window_action >
::cfg_write( TDEConfig& cfg_P ) const
{
diff --git a/khotkeys/shared/action_data.h b/khotkeys/shared/action_data.h
index 5d84c6f18..a29ef591f 100644
--- a/khotkeys/shared/action_data.h
+++ b/khotkeys/shared/action_data.h
@@ -31,7 +31,7 @@ namespace KHotKeys
class Action_data_group;
-class KDE_EXPORT Action_data_base
+class TDE_EXPORT Action_data_base
{
public:
Action_data_base( Action_data_group* parent_P, const TQString& name_P,
@@ -61,7 +61,7 @@ class KDE_EXPORT Action_data_base
KHOTKEYS_DISABLE_COPY( Action_data_base );
};
-class KDE_EXPORT Action_data_group
+class TDE_EXPORT Action_data_group
: public Action_data_base
{
public:
@@ -88,7 +88,7 @@ class KDE_EXPORT Action_data_group
};
// this one represents a "whole" action, i.e. triggers, resulting actions, etc.
-class KDE_EXPORT Action_data
+class TDE_EXPORT Action_data
: public Action_data_base
{
typedef Action_data_base base;
@@ -121,7 +121,7 @@ class KDE_EXPORT Action_data
#endif
};
-class KDE_EXPORT Generic_action_data
+class TDE_EXPORT Generic_action_data
: public Action_data
{
typedef Action_data base;
@@ -141,7 +141,7 @@ class KDE_EXPORT Generic_action_data
};
template< typename T, typename A >
-class KDE_EXPORT Simple_action_data
+class TDE_EXPORT Simple_action_data
: public Action_data
{
typedef Action_data base;
@@ -157,7 +157,7 @@ class KDE_EXPORT Simple_action_data
virtual void cfg_write( TDEConfig& cfg_P ) const;
};
-class KDE_EXPORT Command_url_shortcut_action_data
+class TDE_EXPORT Command_url_shortcut_action_data
: public Simple_action_data< Shortcut_trigger, Command_url_action >
{
typedef Simple_action_data< Shortcut_trigger, Command_url_action > base;
@@ -170,7 +170,7 @@ class KDE_EXPORT Command_url_shortcut_action_data
Command_url_shortcut_action_data( TDEConfig& cfg_P, Action_data_group* parent_P );
};
-class KDE_EXPORT Menuentry_shortcut_action_data
+class TDE_EXPORT Menuentry_shortcut_action_data
: public Simple_action_data< Shortcut_trigger, Menuentry_action >
{
typedef Simple_action_data< Shortcut_trigger, Menuentry_action > base;
@@ -189,7 +189,7 @@ typedef Simple_action_data< Shortcut_trigger, Keyboard_input_action >
typedef Simple_action_data< Shortcut_trigger, Activate_window_action >
Activate_window_shortcut_action_data;
-class KDE_EXPORT Keyboard_input_gesture_action_data
+class TDE_EXPORT Keyboard_input_gesture_action_data
: public Action_data
{
typedef Action_data base;
diff --git a/khotkeys/shared/actions.h b/khotkeys/shared/actions.h
index c7cabf0fc..d2e63db85 100644
--- a/khotkeys/shared/actions.h
+++ b/khotkeys/shared/actions.h
@@ -30,7 +30,7 @@ class Windowdef_list;
// this one is a base for all "real" resulting actions, e.g. running a command,
// Action_data instances usually contain at least one Action
-class KDE_EXPORT Action
+class TDE_EXPORT Action
{
public:
Action( Action_data* data_P );
@@ -46,7 +46,7 @@ class KDE_EXPORT Action
KHOTKEYS_DISABLE_COPY( Action );
};
-class KDE_EXPORT Action_list
+class TDE_EXPORT Action_list
: public TQPtrList< Action >
{
public:
@@ -60,7 +60,7 @@ class KDE_EXPORT Action_list
KHOTKEYS_DISABLE_COPY( Action_list );
};
-class KDE_EXPORT Command_url_action
+class TDE_EXPORT Command_url_action
: public Action
{
typedef Action base;
@@ -78,7 +78,7 @@ class KDE_EXPORT Command_url_action
TQString _command_url;
};
-class KDE_EXPORT Menuentry_action
+class TDE_EXPORT Menuentry_action
: public Command_url_action
{
typedef Command_url_action base;
@@ -94,7 +94,7 @@ class KDE_EXPORT Menuentry_action
KService::Ptr _service;
};
-class KDE_EXPORT Dcop_action
+class TDE_EXPORT Dcop_action
: public Action
{
typedef Action base;
@@ -117,7 +117,7 @@ class KDE_EXPORT Dcop_action
TQString args;
};
-class KDE_EXPORT Keyboard_input_action
+class TDE_EXPORT Keyboard_input_action
: public Action
{
typedef Action base;
@@ -142,7 +142,7 @@ class KDE_EXPORT Keyboard_input_action
bool _active_window;
};
-class KDE_EXPORT Activate_window_action
+class TDE_EXPORT Activate_window_action
: public Action
{
typedef Action base;
@@ -159,7 +159,7 @@ class KDE_EXPORT Activate_window_action
const Windowdef_list* _window;
};
-class KDE_EXPORT Waiting_action
+class TDE_EXPORT Waiting_action
: public Action
{
typedef Action base;
diff --git a/khotkeys/shared/conditions.h b/khotkeys/shared/conditions.h
index 8e5b9e813..02b43a63c 100644
--- a/khotkeys/shared/conditions.h
+++ b/khotkeys/shared/conditions.h
@@ -30,7 +30,7 @@ class Action_data_base;
class Action_data;
class Condition_list_base;
-class KDE_EXPORT Condition
+class TDE_EXPORT Condition
{
public:
Condition( Condition_list_base* parent_P );
@@ -49,7 +49,7 @@ class KDE_EXPORT Condition
KHOTKEYS_DISABLE_COPY( Condition );
};
-class KDE_EXPORT Condition_list_base
+class TDE_EXPORT Condition_list_base
: public Condition, public TQPtrList< Condition > // inheritance ?
{
typedef Condition base;
@@ -64,7 +64,7 @@ class KDE_EXPORT Condition_list_base
typedef TQPtrListIterator< Condition > Iterator;
};
-class KDE_EXPORT Condition_list
+class TDE_EXPORT Condition_list
: public Condition_list_base
{
typedef Condition_list_base base;
@@ -84,7 +84,7 @@ class KDE_EXPORT Condition_list
Action_data_base* data;
};
-class KDE_EXPORT Active_window_condition
+class TDE_EXPORT Active_window_condition
: public TQObject, public Condition
{
TQ_OBJECT
@@ -111,7 +111,7 @@ class KDE_EXPORT Active_window_condition
bool is_match;
};
-class KDE_EXPORT Existing_window_condition
+class TDE_EXPORT Existing_window_condition
: public TQObject, public Condition
{
TQ_OBJECT
@@ -139,7 +139,7 @@ class KDE_EXPORT Existing_window_condition
bool is_match;
};
-class KDE_EXPORT Not_condition
+class TDE_EXPORT Not_condition
: public Condition_list_base
{
typedef Condition_list_base base;
@@ -154,7 +154,7 @@ class KDE_EXPORT Not_condition
virtual bool accepts_children() const;
};
-class KDE_EXPORT And_condition
+class TDE_EXPORT And_condition
: public Condition_list_base
{
typedef Condition_list_base base;
@@ -167,7 +167,7 @@ class KDE_EXPORT And_condition
virtual const TQString description() const;
};
-class KDE_EXPORT Or_condition
+class TDE_EXPORT Or_condition
: public Condition_list_base
{
typedef Condition_list_base base;
diff --git a/khotkeys/shared/gestures.h b/khotkeys/shared/gestures.h
index 01da65d00..9f4825f93 100644
--- a/khotkeys/shared/gestures.h
+++ b/khotkeys/shared/gestures.h
@@ -23,9 +23,9 @@ namespace KHotKeys
{
class Gesture;
-KDE_EXPORT extern Gesture* gesture_handler;
+TDE_EXPORT extern Gesture* gesture_handler;
-class KDE_EXPORT Stroke
+class TDE_EXPORT Stroke
{
public:
// maximum number of numbers in stroke
@@ -62,7 +62,7 @@ class KDE_EXPORT Stroke
char ret_val[ MAX_SEQUENCE ];
};
-class KDE_EXPORT Gesture
+class TDE_EXPORT Gesture
: public TQWidget // not TQObject because of x11EventFilter()
{
TQ_OBJECT
diff --git a/khotkeys/shared/khlistview.h b/khotkeys/shared/khlistview.h
index 1a0f27e2b..7f89cd62b 100644
--- a/khotkeys/shared/khlistview.h
+++ b/khotkeys/shared/khlistview.h
@@ -19,7 +19,7 @@
namespace KHotKeys
{
-class KDE_EXPORT KHListView
+class TDE_EXPORT KHListView
: public TDEListView
{
TQ_OBJECT
diff --git a/khotkeys/shared/khotkeysglobal.h b/khotkeys/shared/khotkeysglobal.h
index c97ef1dea..427958936 100644
--- a/khotkeys/shared/khotkeysglobal.h
+++ b/khotkeys/shared/khotkeysglobal.h
@@ -38,17 +38,17 @@ extern Windows* windows_handler;
#define KHOTKEYS_DISABLE_COPY( cls ) private: cls( const cls& ); cls& operator=( const cls& )
// CHECKME hmms :(
-KDE_EXPORT bool khotkeys_active();
-KDE_EXPORT void khotkeys_set_active( bool active_P );
+TDE_EXPORT bool khotkeys_active();
+TDE_EXPORT void khotkeys_set_active( bool active_P );
TQString get_menu_entry_from_path( const TQString& path_P );
-KDE_EXPORT void init_global_data( bool active_P, TQObject* owner_P );
+TDE_EXPORT void init_global_data( bool active_P, TQObject* owner_P );
const char* const MENU_EDITOR_ENTRIES_GROUP_NAME = I18N_NOOP( "Menu Editor entries" );
-KDE_EXPORT bool haveArts();
-KDE_EXPORT void disableArts();
+TDE_EXPORT bool haveArts();
+TDE_EXPORT void disableArts();
//***************************************************************************
// Inline
diff --git a/khotkeys/shared/settings.h b/khotkeys/shared/settings.h
index e28502cfe..753d056c3 100644
--- a/khotkeys/shared/settings.h
+++ b/khotkeys/shared/settings.h
@@ -26,7 +26,7 @@ enum ImportType
ImportSilent // if already imported before, ignore (called from the update script)
};
-class KDE_EXPORT Settings
+class TDE_EXPORT Settings
{
public:
Settings();
diff --git a/khotkeys/shared/sound.h b/khotkeys/shared/sound.h
index 6453563de..28dfeb0b6 100644
--- a/khotkeys/shared/sound.h
+++ b/khotkeys/shared/sound.h
@@ -27,7 +27,7 @@
/**
@author Olivier Goffart
*/
-class KDE_EXPORT Sound{
+class TDE_EXPORT Sound{
public:
Sound();
~Sound();
diff --git a/khotkeys/shared/soundrecorder.h b/khotkeys/shared/soundrecorder.h
index 5a770abbe..54324f27f 100644
--- a/khotkeys/shared/soundrecorder.h
+++ b/khotkeys/shared/soundrecorder.h
@@ -34,7 +34,7 @@ namespace KHotKeys
/**
@author Olivier Goffart
*/
-class KDE_EXPORT SoundRecorder : public TQObject
+class TDE_EXPORT SoundRecorder : public TQObject
{
TQ_OBJECT
public:
diff --git a/khotkeys/shared/triggers.h b/khotkeys/shared/triggers.h
index 3ed2171f0..ddc757e30 100644
--- a/khotkeys/shared/triggers.h
+++ b/khotkeys/shared/triggers.h
@@ -29,7 +29,7 @@ namespace KHotKeys
class Windowdef_list;
class Action_data;
-class KDE_EXPORT Trigger
+class TDE_EXPORT Trigger
{
public:
Trigger( Action_data* data_P );
@@ -45,7 +45,7 @@ class KDE_EXPORT Trigger
KHOTKEYS_DISABLE_COPY( Trigger );
};
-class KDE_EXPORT Trigger_list
+class TDE_EXPORT Trigger_list
: public TQPtrList< Trigger >
{
public:
@@ -61,7 +61,7 @@ class KDE_EXPORT Trigger_list
KHOTKEYS_DISABLE_COPY( Trigger_list );
};
-class KDE_EXPORT Shortcut_trigger
+class TDE_EXPORT Shortcut_trigger
: public Trigger, public Kbd_receiver
{
typedef Trigger base;
@@ -79,7 +79,7 @@ class KDE_EXPORT Shortcut_trigger
TDEShortcut _shortcut;
};
-class KDE_EXPORT Window_trigger
+class TDE_EXPORT Window_trigger
: public TQObject, public Trigger
{
TQ_OBJECT
@@ -121,7 +121,7 @@ class KDE_EXPORT Window_trigger
bool active;
};
-class KDE_EXPORT Gesture_trigger
+class TDE_EXPORT Gesture_trigger
: public TQObject, public Trigger
{
TQ_OBJECT
@@ -142,7 +142,7 @@ class KDE_EXPORT Gesture_trigger
};
-class KDE_EXPORT Voice_trigger
+class TDE_EXPORT Voice_trigger
: public TQObject, public Trigger
{
TQ_OBJECT
diff --git a/khotkeys/shared/voices.h b/khotkeys/shared/voices.h
index ccf7943fc..f5e1127ff 100644
--- a/khotkeys/shared/voices.h
+++ b/khotkeys/shared/voices.h
@@ -28,7 +28,7 @@ class Voice_trigger;
class VoiceSignature;
-class KDE_EXPORT Voice : public TQObject
+class TDE_EXPORT Voice : public TQObject
{
TQ_OBJECT
public:
@@ -76,7 +76,7 @@ class KDE_EXPORT Voice : public TQObject
};
-KDE_EXPORT extern Voice* voice_handler;
+TDE_EXPORT extern Voice* voice_handler;
} // namespace KHotKeys
diff --git a/khotkeys/shared/voicesignature.h b/khotkeys/shared/voicesignature.h
index af987cce1..7b29802a2 100644
--- a/khotkeys/shared/voicesignature.h
+++ b/khotkeys/shared/voicesignature.h
@@ -66,7 +66,7 @@ namespace KHotKeys
/**
@author Olivier Goffart
*/
-class KDE_EXPORT VoiceSignature{
+class TDE_EXPORT VoiceSignature{
public:
explicit VoiceSignature(const Sound& s);
diff --git a/khotkeys/shared/windows.h b/khotkeys/shared/windows.h
index e9868e52b..05890c435 100644
--- a/khotkeys/shared/windows.h
+++ b/khotkeys/shared/windows.h
@@ -34,7 +34,7 @@ const int SUPPORTED_WINDOW_TYPES_MASK = NET::NormalMask | NET::DesktopMask | NET
class Windowdef_list;
/*class Action_data_base;*/
-class KDE_EXPORT Windows
+class TDE_EXPORT Windows
: public TQObject
{
TQ_OBJECT
@@ -67,7 +67,7 @@ class KDE_EXPORT Windows
WId _action_window;
};
-struct KDE_EXPORT Window_data
+struct TDE_EXPORT Window_data
{
Window_data( WId id_P );
TQString title; // _NET_WM_NAME or WM_NAME
@@ -76,7 +76,7 @@ struct KDE_EXPORT Window_data
NET::WindowType type;
};
-class KDE_EXPORT Windowdef
+class TDE_EXPORT Windowdef
{
public:
Windowdef( const TQString& comment_P );
@@ -93,7 +93,7 @@ class KDE_EXPORT Windowdef
KHOTKEYS_DISABLE_COPY( Windowdef ); // CHECKME asi pak udelat i pro vsechny potomky, at se nezapomene
};
-class KDE_EXPORT Windowdef_list
+class TDE_EXPORT Windowdef_list
: public TQPtrList< Windowdef >
{
public:
@@ -109,7 +109,7 @@ class KDE_EXPORT Windowdef_list
KHOTKEYS_DISABLE_COPY( Windowdef_list );
};
-class KDE_EXPORT Windowdef_simple
+class TDE_EXPORT Windowdef_simple
: public Windowdef
{
typedef Windowdef base;