summaryrefslogtreecommitdiffstats
path: root/khotkeys/shared
diff options
context:
space:
mode:
Diffstat (limited to 'khotkeys/shared')
-rw-r--r--khotkeys/shared/actions.cpp34
-rw-r--r--khotkeys/shared/actions.h29
-rw-r--r--khotkeys/shared/conditions.cpp8
-rw-r--r--khotkeys/shared/conditions.h4
-rw-r--r--khotkeys/shared/gestures.cpp10
-rw-r--r--khotkeys/shared/gestures.h4
-rw-r--r--khotkeys/shared/input.cpp8
-rw-r--r--khotkeys/shared/input.h2
-rw-r--r--khotkeys/shared/khlistbox.cpp16
-rw-r--r--khotkeys/shared/khlistbox.h2
-rw-r--r--khotkeys/shared/khlistview.cpp16
-rw-r--r--khotkeys/shared/khlistview.h2
-rw-r--r--khotkeys/shared/settings.cpp6
-rw-r--r--khotkeys/shared/soundrecorder.h2
-rw-r--r--khotkeys/shared/triggers.cpp20
-rw-r--r--khotkeys/shared/triggers.h6
-rw-r--r--khotkeys/shared/voices.cpp6
-rw-r--r--khotkeys/shared/voices.h2
-rw-r--r--khotkeys/shared/windows.cpp8
-rw-r--r--khotkeys/shared/windows.h2
20 files changed, 123 insertions, 64 deletions
diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp
index c8590789a..69c853fed 100644
--- a/khotkeys/shared/actions.cpp
+++ b/khotkeys/shared/actions.cpp
@@ -54,7 +54,9 @@ Action* Action::create_cfg_read( TDEConfig& cfg_P, Action_data* data_P )
return new Keyboard_input_action( cfg_P, data_P );
if( type == "ACTIVATE_WINDOW" )
return new Activate_window_action( cfg_P, data_P );
- kdWarning( 1217 ) << "Unknown Action type read from cfg file\n";
+ if( type == "WAITING" )
+ return new Waiting_action( cfg_P, data_P );
+ kdWarning( 1217 ) << "Unknown Action type read from cfg file: " << type << endl;
return NULL;
}
@@ -452,4 +454,34 @@ Action* Activate_window_action::copy( Action_data* data_P ) const
return new Activate_window_action( data_P, window()->copy());
}
+// Waiting_action
+
+Waiting_action::Waiting_action( TDEConfig& cfg_P, Action_data* data_P )
+ : Action( cfg_P, data_P )
+ {
+ _waiting_time = cfg_P.readNumEntry("Time");
+ }
+
+void Waiting_action::cfg_write( TDEConfig& cfg_P ) const
+ {
+ base::cfg_write( cfg_P );
+ cfg_P.writeEntry( "Type", "WAITING" ); // overwrites value set in base::cfg_write()
+ cfg_P.writeEntry( "Time", _waiting_time);
+ }
+
+void Waiting_action::execute()
+ {
+ usleep(_waiting_time * 1000);
+ }
+
+TQString Waiting_action::description() const
+ {
+ return i18n( "Waiting %1 ms" ).arg(_waiting_time);
+ }
+
+Action* Waiting_action::copy( Action_data* data_P ) const
+ {
+ return new Waiting_action( data_P, _waiting_time);
+ }
+
} // namespace KHotKeys
diff --git a/khotkeys/shared/actions.h b/khotkeys/shared/actions.h
index f381683e1..c7cabf0fc 100644
--- a/khotkeys/shared/actions.h
+++ b/khotkeys/shared/actions.h
@@ -50,7 +50,7 @@ class KDE_EXPORT Action_list
: public TQPtrList< Action >
{
public:
- Action_list( const TQString& comment_P ); // CHECKME nebo i data ?
+ Action_list( const TQString& comment_P );
Action_list( TDEConfig& cfg_P, Action_data* data_P );
void cfg_write( TDEConfig& cfg_P ) const;
typedef TQPtrListIterator< Action > Iterator;
@@ -111,7 +111,7 @@ class KDE_EXPORT Dcop_action
virtual TQString description() const;
virtual Action* copy( Action_data* data_P ) const;
private:
- TQString app; // CHECKME TQCString ?
+ TQString app;
TQString obj;
TQString call;
TQString args;
@@ -159,6 +159,21 @@ class KDE_EXPORT Activate_window_action
const Windowdef_list* _window;
};
+class KDE_EXPORT Waiting_action
+ : public Action
+ {
+ typedef Action base;
+ public:
+ Waiting_action( Action_data* data_P, const int waiting_time );
+ Waiting_action( TDEConfig& cfg_P, Action_data* data_P );
+ virtual void cfg_write( TDEConfig& cfg_P ) const;
+ virtual void execute();
+ virtual TQString description() const;
+ virtual Action* copy( Action_data* data_P ) const;
+
+ int _waiting_time;
+ };
+
//***************************************************************************
// Inline
//***************************************************************************
@@ -300,6 +315,14 @@ const Windowdef_list* Activate_window_action::window() const
return _window;
}
+// Waiting_action
+
+inline
+Waiting_action::Waiting_action( Action_data* data_P, const int waiting_time)
+ : Action( data_P ), _waiting_time(waiting_time)
+ {
+ }
+
} // namespace KHotKeys
-
+
#endif
diff --git a/khotkeys/shared/conditions.cpp b/khotkeys/shared/conditions.cpp
index b09284b44..1d9f37b9c 100644
--- a/khotkeys/shared/conditions.cpp
+++ b/khotkeys/shared/conditions.cpp
@@ -257,8 +257,8 @@ Active_window_condition::Active_window_condition( TDEConfig& cfg_P, Condition_li
void Active_window_condition::init()
{
- connect( windows_handler, TQT_SIGNAL( active_window_changed( WId )),
- this, TQT_SLOT( active_window_changed( WId )));
+ connect( windows_handler, TQ_SIGNAL( active_window_changed( WId )),
+ this, TQ_SLOT( active_window_changed( WId )));
}
bool Active_window_condition::match() const
@@ -323,8 +323,8 @@ Existing_window_condition::Existing_window_condition( TDEConfig& cfg_P, Conditio
void Existing_window_condition::init()
{
- connect( windows_handler, TQT_SIGNAL( window_added( WId )), this, TQT_SLOT( window_added( WId )));
- connect( windows_handler, TQT_SIGNAL( window_removed( WId )), this, TQT_SLOT( window_removed( WId )));
+ connect( windows_handler, TQ_SIGNAL( window_added( WId )), this, TQ_SLOT( window_added( WId )));
+ connect( windows_handler, TQ_SIGNAL( window_removed( WId )), this, TQ_SLOT( window_removed( WId )));
}
bool Existing_window_condition::match() const
diff --git a/khotkeys/shared/conditions.h b/khotkeys/shared/conditions.h
index ff1af7d07..8e5b9e813 100644
--- a/khotkeys/shared/conditions.h
+++ b/khotkeys/shared/conditions.h
@@ -87,7 +87,7 @@ class KDE_EXPORT Condition_list
class KDE_EXPORT Active_window_condition
: public TQObject, public Condition
{
- Q_OBJECT
+ TQ_OBJECT
typedef Condition base;
public:
Active_window_condition( Windowdef_list* window_P, Condition_list_base* parent_P );
@@ -114,7 +114,7 @@ class KDE_EXPORT Active_window_condition
class KDE_EXPORT Existing_window_condition
: public TQObject, public Condition
{
- Q_OBJECT
+ TQ_OBJECT
typedef Condition base;
public:
Existing_window_condition( Windowdef_list* window_P, Condition_list_base* parent_P );
diff --git a/khotkeys/shared/gestures.cpp b/khotkeys/shared/gestures.cpp
index 9933ba74f..5777f9a4f 100644
--- a/khotkeys/shared/gestures.cpp
+++ b/khotkeys/shared/gestures.cpp
@@ -49,9 +49,9 @@ Gesture::Gesture( bool /*enabled_P*/, TQObject* parent_P )
(void) new DeleteObject( this, parent_P );
assert( gesture_handler == NULL );
gesture_handler = this;
- connect( &nostroke_timer, TQT_SIGNAL( timeout()), TQT_SLOT( stroke_timeout()));
- connect( windows_handler, TQT_SIGNAL( active_window_changed( WId )),
- TQT_SLOT( active_window_changed( WId )));
+ connect( &nostroke_timer, TQ_SIGNAL( timeout()), TQ_SLOT( stroke_timeout()));
+ connect( windows_handler, TQ_SIGNAL( active_window_changed( WId )),
+ TQ_SLOT( active_window_changed( WId )));
}
Gesture::~Gesture()
@@ -108,7 +108,7 @@ void Gesture::register_handler( TQObject* receiver_P, const char* slot_P )
if( handlers.contains( receiver_P ))
return;
handlers[ receiver_P ] = true;
- connect( this, TQT_SIGNAL( handle_gesture( const TQString&, WId )),
+ connect( this, TQ_SIGNAL( handle_gesture( const TQString&, WId )),
receiver_P, slot_P );
if( handlers.count() == 1 )
update_grab();
@@ -119,7 +119,7 @@ void Gesture::unregister_handler( TQObject* receiver_P, const char* slot_P )
if( !handlers.contains( receiver_P ))
return;
handlers.remove( receiver_P );
- disconnect( this, TQT_SIGNAL( handle_gesture( const TQString&, WId )),
+ disconnect( this, TQ_SIGNAL( handle_gesture( const TQString&, WId )),
receiver_P, slot_P );
if( handlers.count() == 0 )
update_grab();
diff --git a/khotkeys/shared/gestures.h b/khotkeys/shared/gestures.h
index 4f0f3f94c..01da65d00 100644
--- a/khotkeys/shared/gestures.h
+++ b/khotkeys/shared/gestures.h
@@ -65,7 +65,7 @@ class KDE_EXPORT Stroke
class KDE_EXPORT Gesture
: public TQWidget // not TQObject because of x11EventFilter()
{
- Q_OBJECT
+ TQ_OBJECT
public:
Gesture( bool enabled_P, TQObject* parent_P );
virtual ~Gesture();
@@ -103,7 +103,7 @@ class KDE_EXPORT Gesture
class DeleteObject
: public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
DeleteObject( TQWidget* widget_P, TQObject* parent_P )
: TQObject( parent_P ), widget( widget_P ) {}
diff --git a/khotkeys/shared/input.cpp b/khotkeys/shared/input.cpp
index 7b9696c7e..96338b055 100644
--- a/khotkeys/shared/input.cpp
+++ b/khotkeys/shared/input.cpp
@@ -106,12 +106,12 @@ void Kbd::grab_shortcut( const TDEShortcut& shortcut_P )
// CHECKME ugly ugly hack
TQString name = ' ' + TQString::number( keycode_P );
kga->insertItem( "", name, keycode_P );
- kga->connectItem( name, this, TQT_SLOT( key_slot( int )));
+ kga->connectItem( name, this, TQ_SLOT( key_slot( int )));
#endif
TQString name = ' ' + shortcut_P.toStringInternal();
kga->insert( name, name, TQString::null, shortcut_P, shortcut_P,
- this, TQT_SLOT( key_slot( TQString )));
- TQTimer::singleShot( 0, this, TQT_SLOT( update_connections()));
+ this, TQ_SLOT( key_slot( TQString )));
+ TQTimer::singleShot( 0, this, TQ_SLOT( update_connections()));
}
}
@@ -129,7 +129,7 @@ void Kbd::ungrab_shortcut( const TDEShortcut& shortcut_P )
#endif
kga->remove( ' ' + shortcut_P.toStringInternal());
grabs.remove( shortcut_P );
- TQTimer::singleShot( 0, this, TQT_SLOT( update_connections()));
+ TQTimer::singleShot( 0, this, TQ_SLOT( update_connections()));
}
}
diff --git a/khotkeys/shared/input.h b/khotkeys/shared/input.h
index c6bbdf1e5..e810cea80 100644
--- a/khotkeys/shared/input.h
+++ b/khotkeys/shared/input.h
@@ -35,7 +35,7 @@ class Kbd_receiver
class Kbd
: public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
Kbd( bool grabbing_enabled_P, TQObject* parent_P );
virtual ~Kbd();
diff --git a/khotkeys/shared/khlistbox.cpp b/khotkeys/shared/khlistbox.cpp
index ff6d96221..f0080d6de 100644
--- a/khotkeys/shared/khlistbox.cpp
+++ b/khotkeys/shared/khlistbox.cpp
@@ -25,15 +25,15 @@ KHListBox::KHListBox( TQWidget* parent_P, const char* name_P )
: TQListBox( parent_P, name_P ), saved_current_item( NULL ),
in_clear( false ), force_select( false )
{
- connect( this, TQT_SIGNAL( selectionChanged( TQListBoxItem* )),
- TQT_SLOT( slot_selection_changed( TQListBoxItem* )));
- connect( this, TQT_SIGNAL( currentChanged( TQListBoxItem* )),
- TQT_SLOT( slot_current_changed( TQListBoxItem* )));
+ connect( this, TQ_SIGNAL( selectionChanged( TQListBoxItem* )),
+ TQ_SLOT( slot_selection_changed( TQListBoxItem* )));
+ connect( this, TQ_SIGNAL( currentChanged( TQListBoxItem* )),
+ TQ_SLOT( slot_current_changed( TQListBoxItem* )));
// CHECKME grrr
- connect( this, TQT_SIGNAL( selectionChanged()),
- TQT_SLOT( slot_selection_changed()));
- connect( &insert_select_timer, TQT_SIGNAL( timeout()),
- TQT_SLOT( slot_insert_select()));
+ connect( this, TQ_SIGNAL( selectionChanged()),
+ TQ_SLOT( slot_selection_changed()));
+ connect( &insert_select_timer, TQ_SIGNAL( timeout()),
+ TQ_SLOT( slot_insert_select()));
}
void KHListBox::slot_selection_changed()
diff --git a/khotkeys/shared/khlistbox.h b/khotkeys/shared/khlistbox.h
index d0f9b51ae..8f4a77138 100644
--- a/khotkeys/shared/khlistbox.h
+++ b/khotkeys/shared/khlistbox.h
@@ -21,7 +21,7 @@ namespace KHotKeys
class KHListBox
: public TQListBox
{
- Q_OBJECT
+ TQ_OBJECT
TQ_PROPERTY( bool forceSelect READ forceSelect WRITE setForceSelect )
public:
KHListBox( TQWidget* parent_P, const char* name_P = NULL );
diff --git a/khotkeys/shared/khlistview.cpp b/khotkeys/shared/khlistview.cpp
index ae348af33..a9943996a 100644
--- a/khotkeys/shared/khlistview.cpp
+++ b/khotkeys/shared/khlistview.cpp
@@ -25,15 +25,15 @@ KHListView::KHListView( TQWidget* parent_P, const char* name_P )
: TDEListView( parent_P, name_P ), saved_current_item( NULL ),
in_clear( false ), ignore( false ), force_select( false )
{
- connect( this, TQT_SIGNAL( selectionChanged( TQListViewItem* )),
- TQT_SLOT( slot_selection_changed( TQListViewItem* )));
- connect( this, TQT_SIGNAL( currentChanged( TQListViewItem* )),
- TQT_SLOT( slot_current_changed( TQListViewItem* )));
+ connect( this, TQ_SIGNAL( selectionChanged( TQListViewItem* )),
+ TQ_SLOT( slot_selection_changed( TQListViewItem* )));
+ connect( this, TQ_SIGNAL( currentChanged( TQListViewItem* )),
+ TQ_SLOT( slot_current_changed( TQListViewItem* )));
// CHECKME grrr
- connect( this, TQT_SIGNAL( selectionChanged()),
- TQT_SLOT( slot_selection_changed()));
- connect( &insert_select_timer, TQT_SIGNAL( timeout()),
- TQT_SLOT( slot_insert_select()));
+ connect( this, TQ_SIGNAL( selectionChanged()),
+ TQ_SLOT( slot_selection_changed()));
+ connect( &insert_select_timer, TQ_SIGNAL( timeout()),
+ TQ_SLOT( slot_insert_select()));
}
void KHListView::slot_selection_changed()
diff --git a/khotkeys/shared/khlistview.h b/khotkeys/shared/khlistview.h
index 2cee34617..1a0f27e2b 100644
--- a/khotkeys/shared/khlistview.h
+++ b/khotkeys/shared/khlistview.h
@@ -22,7 +22,7 @@ namespace KHotKeys
class KDE_EXPORT KHListView
: public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
TQ_PROPERTY( bool forceSelect READ forceSelect WRITE setForceSelect )
public:
KHListView( TQWidget* parent_P, const char* name_P = NULL );
diff --git a/khotkeys/shared/settings.cpp b/khotkeys/shared/settings.cpp
index 76adac6b9..becacd5d1 100644
--- a/khotkeys/shared/settings.cpp
+++ b/khotkeys/shared/settings.cpp
@@ -145,9 +145,11 @@ void Settings::write_settings()
gestures_exclude->cfg_write( cfg );
}
else
+ {
cfg.deleteGroup( "GesturesExclude" );
- cfg.setGroup( "Voice" );
- cfg.writeEntry("Shortcut" , voice_shortcut.toStringInternal() );
+ }
+ cfg.setGroup( "Voice" );
+ cfg.writeEntry("Shortcut" , voice_shortcut.toStringInternal() );
}
diff --git a/khotkeys/shared/soundrecorder.h b/khotkeys/shared/soundrecorder.h
index c7e55fc22..5a770abbe 100644
--- a/khotkeys/shared/soundrecorder.h
+++ b/khotkeys/shared/soundrecorder.h
@@ -36,7 +36,7 @@ namespace KHotKeys
*/
class KDE_EXPORT SoundRecorder : public TQObject
{
-Q_OBJECT
+TQ_OBJECT
public:
static SoundRecorder* create( TQObject* parent = 0, const char* name = 0 );
virtual ~SoundRecorder();
diff --git a/khotkeys/shared/triggers.cpp b/khotkeys/shared/triggers.cpp
index 115bc6687..1b6e903b7 100644
--- a/khotkeys/shared/triggers.cpp
+++ b/khotkeys/shared/triggers.cpp
@@ -197,13 +197,13 @@ Window_trigger::~Window_trigger()
void Window_trigger::init()
{
kdDebug( 1217 ) << "Window_trigger::init()" << endl;
- connect( windows_handler, TQT_SIGNAL( window_added( WId )), this, TQT_SLOT( window_added( WId )));
- connect( windows_handler, TQT_SIGNAL( window_removed( WId )), this, TQT_SLOT( window_removed( WId )));
+ connect( windows_handler, TQ_SIGNAL( window_added( WId )), this, TQ_SLOT( window_added( WId )));
+ connect( windows_handler, TQ_SIGNAL( window_removed( WId )), this, TQ_SLOT( window_removed( WId )));
if( window_actions & ( WINDOW_ACTIVATES | WINDOW_DEACTIVATES /*| WINDOW_DISAPPEARS*/ ))
- connect( windows_handler, TQT_SIGNAL( active_window_changed( WId )),
- this, TQT_SLOT( active_window_changed( WId )));
- connect( windows_handler, TQT_SIGNAL( window_changed( WId, unsigned int )),
- this, TQT_SLOT( window_changed( WId, unsigned int )));
+ connect( windows_handler, TQ_SIGNAL( active_window_changed( WId )),
+ this, TQ_SLOT( active_window_changed( WId )));
+ connect( windows_handler, TQ_SIGNAL( window_changed( WId, unsigned int )),
+ this, TQ_SLOT( window_changed( WId, unsigned int )));
}
void Window_trigger::activate( bool activate_P )
@@ -277,6 +277,7 @@ void Window_trigger::window_changed( WId window_P, unsigned int dirty_P )
bool matches = windows()->match( Window_data( window_P ));
existing_windows[ window_P ] = matches;
if( active && matches && !was_match )
+ {
if( window_actions & WINDOW_APPEARS )
{
windows_handler->set_action_window( window_P );
@@ -287,6 +288,7 @@ void Window_trigger::window_changed( WId window_P, unsigned int dirty_P )
windows_handler->set_action_window( window_P );
data->execute();
}
+ }
kdDebug( 1217 ) << "Window_trigger::w_changed() : " << was_match << "|" << matches << endl;
}
@@ -333,7 +335,7 @@ Gesture_trigger::Gesture_trigger( TDEConfig& cfg_P, Action_data* data_P )
Gesture_trigger::~Gesture_trigger()
{
- gesture_handler->unregister_handler( this, TQT_SLOT( handle_gesture( const TQString&, WId )));
+ gesture_handler->unregister_handler( this, TQ_SLOT( handle_gesture( const TQString&, WId )));
}
void Gesture_trigger::cfg_write( TDEConfig& cfg_P ) const
@@ -366,9 +368,9 @@ void Gesture_trigger::handle_gesture( const TQString &gesture_P, WId window_P )
void Gesture_trigger::activate( bool activate_P )
{
if( activate_P )
- gesture_handler->register_handler( this, TQT_SLOT( handle_gesture( const TQString&, WId )));
+ gesture_handler->register_handler( this, TQ_SLOT( handle_gesture( const TQString&, WId )));
else
- gesture_handler->unregister_handler( this, TQT_SLOT( handle_gesture( const TQString&, WId )));
+ gesture_handler->unregister_handler( this, TQ_SLOT( handle_gesture( const TQString&, WId )));
}
diff --git a/khotkeys/shared/triggers.h b/khotkeys/shared/triggers.h
index c74a3a54a..3ed2171f0 100644
--- a/khotkeys/shared/triggers.h
+++ b/khotkeys/shared/triggers.h
@@ -82,7 +82,7 @@ class KDE_EXPORT Shortcut_trigger
class KDE_EXPORT Window_trigger
: public TQObject, public Trigger
{
- Q_OBJECT
+ TQ_OBJECT
typedef Trigger base;
public:
enum window_action_t
@@ -124,7 +124,7 @@ class KDE_EXPORT Window_trigger
class KDE_EXPORT Gesture_trigger
: public TQObject, public Trigger
{
- Q_OBJECT
+ TQ_OBJECT
typedef Trigger base;
public:
Gesture_trigger( Action_data* data_P, const TQString& gesture_P );
@@ -145,7 +145,7 @@ class KDE_EXPORT Gesture_trigger
class KDE_EXPORT Voice_trigger
: public TQObject, public Trigger
{
- Q_OBJECT
+ TQ_OBJECT
typedef Trigger base;
public:
Voice_trigger( Action_data* data_P, const TQString& Voice_P, const VoiceSignature & signature1_P, const VoiceSignature & signature2_P );
diff --git a/khotkeys/shared/voices.cpp b/khotkeys/shared/voices.cpp
index a31ac8237..031f75c78 100644
--- a/khotkeys/shared/voices.cpp
+++ b/khotkeys/shared/voices.cpp
@@ -95,7 +95,7 @@ void Voice::record_start()
if(!_recorder)
{
_recorder= SoundRecorder::create(this);
- connect(_recorder, TQT_SIGNAL(recorded(const Sound& )), this, TQT_SLOT(slot_sound_recorded(const Sound& )));
+ connect(_recorder, TQ_SIGNAL(recorded(const Sound& )), this, TQ_SLOT(slot_sound_recorded(const Sound& )));
}
_recorder->start();
@@ -208,7 +208,7 @@ void Voice::set_shortcut( const TDEShortcut &shortcut)
_kga = new TDEGlobalAccel( this );
_kga->remove("voice");
- _kga->insert( "voice", i18n("Voice"), TQString::null, shortcut, 0, this, TQT_SLOT(slot_key_pressed())) ;
+ _kga->insert( "voice", i18n("Voice"), TQString::null, shortcut, 0, this, TQ_SLOT(slot_key_pressed())) ;
_kga->updateConnections();
}
@@ -224,7 +224,7 @@ void Voice::slot_key_pressed()
if(!_timer)
{
_timer=new TQTimer(this);
- connect(_timer, TQT_SIGNAL(timeout()) , this, TQT_SLOT(slot_timeout()));
+ connect(_timer, TQ_SIGNAL(timeout()) , this, TQ_SLOT(slot_timeout()));
}
_timer->start(1000*20,true);
diff --git a/khotkeys/shared/voices.h b/khotkeys/shared/voices.h
index ccd07563f..ccf7943fc 100644
--- a/khotkeys/shared/voices.h
+++ b/khotkeys/shared/voices.h
@@ -30,7 +30,7 @@ class VoiceSignature;
class KDE_EXPORT Voice : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
Voice( bool enabled_P, TQObject* parent_P );
virtual ~Voice();
diff --git a/khotkeys/shared/windows.cpp b/khotkeys/shared/windows.cpp
index 077bf7b1d..e91e41df3 100644
--- a/khotkeys/shared/windows.cpp
+++ b/khotkeys/shared/windows.cpp
@@ -45,10 +45,10 @@ Windows::Windows( bool enable_signal_P, TQObject* parent_P )
windows_handler = this;
if( signals_enabled )
{
- connect( twin_module, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( window_added_slot( WId )));
- connect( twin_module, TQT_SIGNAL( windowRemoved( WId )), TQT_SLOT( window_removed_slot( WId )));
- connect( twin_module, TQT_SIGNAL( activeWindowChanged( WId )),
- TQT_SLOT( active_window_changed_slot( WId )));
+ connect( twin_module, TQ_SIGNAL( windowAdded( WId )), TQ_SLOT( window_added_slot( WId )));
+ connect( twin_module, TQ_SIGNAL( windowRemoved( WId )), TQ_SLOT( window_removed_slot( WId )));
+ connect( twin_module, TQ_SIGNAL( activeWindowChanged( WId )),
+ TQ_SLOT( active_window_changed_slot( WId )));
}
}
diff --git a/khotkeys/shared/windows.h b/khotkeys/shared/windows.h
index 4fa403436..e9868e52b 100644
--- a/khotkeys/shared/windows.h
+++ b/khotkeys/shared/windows.h
@@ -37,7 +37,7 @@ class Windowdef_list;
class KDE_EXPORT Windows
: public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
Windows( bool enable_signals_P, TQObject* parent_P );
virtual ~Windows();
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 15:30:11 +0000