From cc74f360bb40da3d79f58048f8e8611804980aa6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:30:47 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- khotkeys/shared/action_data.h | 44 +++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'khotkeys/shared/action_data.h') diff --git a/khotkeys/shared/action_data.h b/khotkeys/shared/action_data.h index 4de5e715b..cf1186263 100644 --- a/khotkeys/shared/action_data.h +++ b/khotkeys/shared/action_data.h @@ -17,7 +17,7 @@ #include -class KConfig; +class TDEConfig; #include "khotkeysglobal.h" @@ -36,9 +36,9 @@ class KDE_EXPORT Action_data_base public: Action_data_base( Action_data_group* parent_P, const TQString& name_P, const TQString& comment_P, Condition_list* condition_P, bool enabled_P ); - Action_data_base( KConfig& cfg_P, Action_data_group* parent_P ); + Action_data_base( TDEConfig& cfg_P, Action_data_group* parent_P ); virtual ~Action_data_base(); - virtual void cfg_write( KConfig& cfg_P ) const = 0; + virtual void cfg_write( TDEConfig& cfg_P ) const = 0; const Condition_list* conditions() const; Action_data_group* parent() const; void reparent( Action_data_group* new_parent_P ); @@ -48,8 +48,8 @@ class KDE_EXPORT Action_data_base void set_name( const TQString& name_P ); const TQString& comment() const; bool enabled( bool ignore_group_P ) const; - static Action_data_base* create_cfg_read( KConfig& cfg_P, Action_data_group* parent_P ); - static bool cfg_is_enabled( KConfig& cfg_P ); + static Action_data_base* create_cfg_read( TDEConfig& cfg_P, Action_data_group* parent_P ); + static bool cfg_is_enabled( TDEConfig& cfg_P ); protected: void set_conditions( Condition_list* conditions_P ); private: @@ -70,10 +70,10 @@ class KDE_EXPORT Action_data_group Action_data_group( Action_data_group* parent_P, const TQString& name_P, const TQString& comment_P, Condition_list* conditions_P, system_group_t system_group_P, bool enabled_P ); - Action_data_group( KConfig& cfg_P, Action_data_group* parent_P ); + Action_data_group( TDEConfig& cfg_P, Action_data_group* parent_P ); virtual ~Action_data_group(); virtual void update_triggers(); - virtual void cfg_write( KConfig& cfg_P ) const; + virtual void cfg_write( TDEConfig& cfg_P ) const; typedef TQPtrListIterator< Action_data_base > Iterator; // CHECKME neni const :( Iterator first_child() const; bool is_system_group() const; @@ -96,10 +96,10 @@ class KDE_EXPORT Action_data Action_data( Action_data_group* parent_P, const TQString& name_P, const TQString& comment_P, Trigger_list* triggers_P, Condition_list* conditions_P, Action_list* actions_P, bool enabled_P = true ); - Action_data( KConfig& cfg_P, Action_data_group* parent_P ); + Action_data( TDEConfig& cfg_P, Action_data_group* parent_P ); virtual ~Action_data(); virtual void update_triggers(); - virtual void cfg_write( KConfig& cfg_P ) const = 0; + virtual void cfg_write( TDEConfig& cfg_P ) const = 0; virtual void execute(); const Trigger_list* triggers() const; const Action_list* actions() const; @@ -129,8 +129,8 @@ class KDE_EXPORT Generic_action_data Generic_action_data( Action_data_group* parent_P, const TQString& name_P, const TQString& comment_P, Trigger_list* triggers_P, Condition_list* conditions_P, Action_list* actions_P, bool enabled_P = true ); - Generic_action_data( KConfig& cfg_P, Action_data_group* parent_P ); - virtual void cfg_write( KConfig& cfg_P ) const; + Generic_action_data( TDEConfig& cfg_P, Action_data_group* parent_P ); + virtual void cfg_write( TDEConfig& cfg_P ) const; using Action_data_base::set_conditions; // make public using Action_data::add_trigger; // make public using Action_data::add_triggers; // make public @@ -148,13 +148,13 @@ class KDE_EXPORT Simple_action_data public: Simple_action_data( Action_data_group* parent_P, const TQString& name_P, const TQString& comment_P, bool enabled_P = true ); - Simple_action_data( KConfig& cfg_P, Action_data_group* parent_P ); + Simple_action_data( TDEConfig& cfg_P, Action_data_group* parent_P ); const A* action() const; const T* trigger() const; // CHECKME kontrola, ze se dava jen jedna akce ? void set_action( A* action_P ); void set_trigger( T* trigger_P ); - virtual void cfg_write( KConfig& cfg_P ) const; + virtual void cfg_write( TDEConfig& cfg_P ) const; }; class KDE_EXPORT Command_url_shortcut_action_data @@ -167,7 +167,7 @@ class KDE_EXPORT Command_url_shortcut_action_data Command_url_shortcut_action_data( Action_data_group* parent_P, const TQString& name_P, const TQString& comment_P, const KShortcut& shortcut_P, const TQString& command_url_P, bool enabled_P = true ); - Command_url_shortcut_action_data( KConfig& cfg_P, Action_data_group* parent_P ); + Command_url_shortcut_action_data( TDEConfig& cfg_P, Action_data_group* parent_P ); }; class KDE_EXPORT Menuentry_shortcut_action_data @@ -180,7 +180,7 @@ class KDE_EXPORT Menuentry_shortcut_action_data Menuentry_shortcut_action_data( Action_data_group* parent_P, const TQString& name_P, const TQString& comment_P, const KShortcut& shortcut_P, const TQString& command_url_P, bool enabled_P = true ); - Menuentry_shortcut_action_data( KConfig& cfg_P, Action_data_group* parent_P ); + Menuentry_shortcut_action_data( TDEConfig& cfg_P, Action_data_group* parent_P ); }; typedef Simple_action_data< Shortcut_trigger, Dcop_action > Dcop_shortcut_action_data; @@ -196,13 +196,13 @@ class KDE_EXPORT Keyboard_input_gesture_action_data public: Keyboard_input_gesture_action_data( Action_data_group* parent_P, const TQString& name_P, const TQString& comment_P, bool enabled_P = true ); - Keyboard_input_gesture_action_data( KConfig& cfg_P, Action_data_group* parent_P ); + Keyboard_input_gesture_action_data( TDEConfig& cfg_P, Action_data_group* parent_P ); const Keyboard_input_action* action() const; // CHECKME kontrola, ze se dava jen jedna akce ? void set_action( Keyboard_input_action* action_P ); enum { NUM_TRIGGERS = 3 }; // needs changing code elsewhere using Action_data::set_triggers; // make public // CHECKME kontrola poctu? - virtual void cfg_write( KConfig& cfg_P ) const; + virtual void cfg_write( TDEConfig& cfg_P ) const; }; @@ -335,7 +335,7 @@ Generic_action_data::Generic_action_data( Action_data_group* parent_P, const TQS } inline -Generic_action_data::Generic_action_data( KConfig& cfg_P, Action_data_group* parent_P ) +Generic_action_data::Generic_action_data( TDEConfig& cfg_P, Action_data_group* parent_P ) : Action_data( cfg_P, parent_P ) { // CHECKME do nothing ? } @@ -353,7 +353,7 @@ Simple_action_data< T, A >::Simple_action_data( Action_data_group* parent_P, template< typename T, typename A > inline -Simple_action_data< T, A >::Simple_action_data( KConfig& cfg_P, Action_data_group* parent_P ) +Simple_action_data< T, A >::Simple_action_data( TDEConfig& cfg_P, Action_data_group* parent_P ) : Action_data( cfg_P, parent_P ) { // CHECKME nothing ? } @@ -401,7 +401,7 @@ Command_url_shortcut_action_data::Command_url_shortcut_action_data( Action_data_ } inline -Command_url_shortcut_action_data::Command_url_shortcut_action_data( KConfig& cfg_P, +Command_url_shortcut_action_data::Command_url_shortcut_action_data( TDEConfig& cfg_P, Action_data_group* parent_P ) : Simple_action_data< Shortcut_trigger, Command_url_action >( cfg_P, parent_P ) { @@ -418,7 +418,7 @@ Menuentry_shortcut_action_data::Menuentry_shortcut_action_data( Action_data_grou } inline -Menuentry_shortcut_action_data::Menuentry_shortcut_action_data( KConfig& cfg_P, +Menuentry_shortcut_action_data::Menuentry_shortcut_action_data( TDEConfig& cfg_P, Action_data_group* parent_P ) : Simple_action_data< Shortcut_trigger, Menuentry_action >( cfg_P, parent_P ) { @@ -435,7 +435,7 @@ Keyboard_input_gesture_action_data::Keyboard_input_gesture_action_data( } inline -Keyboard_input_gesture_action_data::Keyboard_input_gesture_action_data( KConfig& cfg_P, +Keyboard_input_gesture_action_data::Keyboard_input_gesture_action_data( TDEConfig& cfg_P, Action_data_group* parent_P ) : Action_data( cfg_P, parent_P ) { // CHECKME nothing ? -- cgit v1.2.1