summaryrefslogtreecommitdiffstats
path: root/twin/kcmtwin/twinrules
diff options
context:
space:
mode:
Diffstat (limited to 'twin/kcmtwin/twinrules')
-rw-r--r--twin/kcmtwin/twinrules/detectwidget.cpp6
-rw-r--r--twin/kcmtwin/twinrules/detectwidget.h4
-rw-r--r--twin/kcmtwin/twinrules/editshortcutbase.ui4
-rw-r--r--twin/kcmtwin/twinrules/kcm.cpp6
-rw-r--r--twin/kcmtwin/twinrules/kcm.h2
-rw-r--r--twin/kcmtwin/twinrules/main.cpp2
-rw-r--r--twin/kcmtwin/twinrules/ruleslist.cpp32
-rw-r--r--twin/kcmtwin/twinrules/ruleslist.h2
-rw-r--r--twin/kcmtwin/twinrules/ruleslistbase.ui7
-rw-r--r--twin/kcmtwin/twinrules/ruleswidget.cpp10
-rw-r--r--twin/kcmtwin/twinrules/ruleswidget.h10
-rw-r--r--twin/kcmtwin/twinrules/ruleswidgetbase.ui31
12 files changed, 45 insertions, 71 deletions
diff --git a/twin/kcmtwin/twinrules/detectwidget.cpp b/twin/kcmtwin/twinrules/detectwidget.cpp
index f450938bc..b01066403 100644
--- a/twin/kcmtwin/twinrules/detectwidget.cpp
+++ b/twin/kcmtwin/twinrules/detectwidget.cpp
@@ -164,19 +164,19 @@ void DetectDialog::selectWindow()
grabber = new TQDialog( NULL, NULL, true, (WFlags)WX11BypassWM );
grabber->move( -1000, -1000 );
grabber->show();
- grabber->grabMouse( tqcrossCursor );
+ grabber->grabMouse( TQt::crossCursor );
grabber->installEventFilter( this );
}
bool DetectDialog::eventFilter( TQObject* o, TQEvent* e )
{
- if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(grabber) )
+ if( o != grabber )
return false;
if( e->type() != TQEvent::MouseButtonRelease )
return false;
delete grabber;
grabber = NULL;
- if( TQT_TQMOUSEEVENT( e )->button() != Qt::LeftButton )
+ if( static_cast<TQMouseEvent*>( e )->button() != TQt::LeftButton )
{
emit detectionDone( false );
return true;
diff --git a/twin/kcmtwin/twinrules/detectwidget.h b/twin/kcmtwin/twinrules/detectwidget.h
index 75e725f5f..ecd608ea7 100644
--- a/twin/kcmtwin/twinrules/detectwidget.h
+++ b/twin/kcmtwin/twinrules/detectwidget.h
@@ -33,7 +33,7 @@ namespace KWinInternal
class DetectWidget
: public DetectWidgetBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
DetectWidget( TQWidget* parent = NULL, const char* name = NULL );
};
@@ -41,7 +41,7 @@ class DetectWidget
class DetectDialog
: public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
DetectDialog( TQWidget* parent = NULL, const char* name = NULL );
void detect( WId window );
diff --git a/twin/kcmtwin/twinrules/editshortcutbase.ui b/twin/kcmtwin/twinrules/editshortcutbase.ui
index 793784c42..8a9339c16 100644
--- a/twin/kcmtwin/twinrules/editshortcutbase.ui
+++ b/twin/kcmtwin/twinrules/editshortcutbase.ui
@@ -155,10 +155,10 @@ For example "&lt;b&gt;Shift+Alt+(123) Shift+Ctrl+(ABC)&lt;/b&gt;" will first try
<slot>clearShortcut()</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot access="protected" specifier="pure virtual">editShortcut()</slot>
<slot access="protected" specifier="pure virtual">clearShortcut()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includes>
diff --git a/twin/kcmtwin/twinrules/kcm.cpp b/twin/kcmtwin/twinrules/kcm.cpp
index 2f28bc5dd..e2a75ee62 100644
--- a/twin/kcmtwin/twinrules/kcm.cpp
+++ b/twin/kcmtwin/twinrules/kcm.cpp
@@ -28,7 +28,7 @@
#include "ruleslist.h"
extern "C"
- KDE_EXPORT TDECModule *create_twinrules( TQWidget *parent, const char *name )
+ TDE_EXPORT TDECModule *create_twinrules( TQWidget *parent, const char *name )
{
//CT there's need for decision: kwm or twin?
TDEGlobal::locale()->insertCatalogue( "kcmtwinrules" );
@@ -44,8 +44,8 @@ KCMRules::KCMRules( TQWidget *parent, const char *name )
{
TQVBoxLayout *layout = new TQVBoxLayout( this );
widget = new KCMRulesList( this );
- layout->addWidget( TQT_TQWIDGET(widget) );
- connect( widget, TQT_SIGNAL( changed( bool )), TQT_SLOT( moduleChanged( bool )));
+ layout->addWidget( widget );
+ connect( widget, TQ_SIGNAL( changed( bool )), TQ_SLOT( moduleChanged( bool )));
TDEAboutData *about = new TDEAboutData(I18N_NOOP( "kcmtwinrules" ),
I18N_NOOP( "Window-Specific Settings Configuration Module" ),
0, 0, TDEAboutData::License_GPL, I18N_NOOP( "(c) 2004 KWin and KControl Authors" ));
diff --git a/twin/kcmtwin/twinrules/kcm.h b/twin/kcmtwin/twinrules/kcm.h
index 5e89a7773..54e044845 100644
--- a/twin/kcmtwin/twinrules/kcm.h
+++ b/twin/kcmtwin/twinrules/kcm.h
@@ -34,7 +34,7 @@ class KCMRulesList;
class KCMRules
: public TDECModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
KCMRules( TQWidget *parent, const char *name );
virtual void load();
diff --git a/twin/kcmtwin/twinrules/main.cpp b/twin/kcmtwin/twinrules/main.cpp
index 21cb007ec..67e21332c 100644
--- a/twin/kcmtwin/twinrules/main.cpp
+++ b/twin/kcmtwin/twinrules/main.cpp
@@ -273,7 +273,7 @@ static const TDECmdLineOptions options[] =
};
extern "C"
-KDE_EXPORT int kdemain( int argc, char* argv[] )
+TDE_EXPORT int kdemain( int argc, char* argv[] )
{
TDELocale::setMainCatalogue( "kcmtwinrules" );
TDECmdLineArgs::init( argc, argv, "twin_rules_dialog", I18N_NOOP( "TWin" ),
diff --git a/twin/kcmtwin/twinrules/ruleslist.cpp b/twin/kcmtwin/twinrules/ruleslist.cpp
index 8961874ae..a9238c178 100644
--- a/twin/kcmtwin/twinrules/ruleslist.cpp
+++ b/twin/kcmtwin/twinrules/ruleslist.cpp
@@ -33,22 +33,22 @@ KCMRulesList::KCMRulesList( TQWidget* parent, const char* name )
: KCMRulesListBase( parent, name )
{
// connect both current/selected, so that current==selected (stupid TQListBox :( )
- connect( rules_listbox, TQT_SIGNAL( currentChanged( TQListBoxItem* )),
- TQT_SLOT( activeChanged( TQListBoxItem*)));
- connect( rules_listbox, TQT_SIGNAL( selectionChanged( TQListBoxItem* )),
- TQT_SLOT( activeChanged( TQListBoxItem*)));
- connect( new_button, TQT_SIGNAL( clicked()),
- TQT_SLOT( newClicked()));
- connect( modify_button, TQT_SIGNAL( clicked()),
- TQT_SLOT( modifyClicked()));
- connect( delete_button, TQT_SIGNAL( clicked()),
- TQT_SLOT( deleteClicked()));
- connect( moveup_button, TQT_SIGNAL( clicked()),
- TQT_SLOT( moveupClicked()));
- connect( movedown_button, TQT_SIGNAL( clicked()),
- TQT_SLOT( movedownClicked()));
- connect( rules_listbox, TQT_SIGNAL( doubleClicked ( TQListBoxItem * ) ),
- TQT_SLOT( modifyClicked()));
+ connect( rules_listbox, TQ_SIGNAL( currentChanged( TQListBoxItem* )),
+ TQ_SLOT( activeChanged( TQListBoxItem*)));
+ connect( rules_listbox, TQ_SIGNAL( selectionChanged( TQListBoxItem* )),
+ TQ_SLOT( activeChanged( TQListBoxItem*)));
+ connect( new_button, TQ_SIGNAL( clicked()),
+ TQ_SLOT( newClicked()));
+ connect( modify_button, TQ_SIGNAL( clicked()),
+ TQ_SLOT( modifyClicked()));
+ connect( delete_button, TQ_SIGNAL( clicked()),
+ TQ_SLOT( deleteClicked()));
+ connect( moveup_button, TQ_SIGNAL( clicked()),
+ TQ_SLOT( moveupClicked()));
+ connect( movedown_button, TQ_SIGNAL( clicked()),
+ TQ_SLOT( movedownClicked()));
+ connect( rules_listbox, TQ_SIGNAL( doubleClicked ( TQListBoxItem * ) ),
+ TQ_SLOT( modifyClicked()));
load();
}
diff --git a/twin/kcmtwin/twinrules/ruleslist.h b/twin/kcmtwin/twinrules/ruleslist.h
index f7e7fb541..837ad6840 100644
--- a/twin/kcmtwin/twinrules/ruleslist.h
+++ b/twin/kcmtwin/twinrules/ruleslist.h
@@ -34,7 +34,7 @@ namespace KWinInternal
class KCMRulesList
: public KCMRulesListBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KCMRulesList( TQWidget* parent = NULL, const char* name = NULL );
virtual ~KCMRulesList();
diff --git a/twin/kcmtwin/twinrules/ruleslistbase.ui b/twin/kcmtwin/twinrules/ruleslistbase.ui
index f079dcda3..233290e38 100644
--- a/twin/kcmtwin/twinrules/ruleslistbase.ui
+++ b/twin/kcmtwin/twinrules/ruleslistbase.ui
@@ -29,7 +29,7 @@
<cstring>new_button</cstring>
</property>
<property name="text">
- <string>&amp;New...</string>
+ <string>&amp;New…</string>
</property>
</widget>
<widget class="KPushButton" row="1" column="1">
@@ -37,7 +37,7 @@
<cstring>modify_button</cstring>
</property>
<property name="text">
- <string>&amp;Modify...</string>
+ <string>&amp;Modify…</string>
</property>
</widget>
<widget class="KPushButton" row="2" column="1">
@@ -47,9 +47,6 @@
<property name="text">
<string>Delete</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="KPushButton" row="3" column="1">
<property name="name">
diff --git a/twin/kcmtwin/twinrules/ruleswidget.cpp b/twin/kcmtwin/twinrules/ruleswidget.cpp
index 334001bf7..116ac8b41 100644
--- a/twin/kcmtwin/twinrules/ruleswidget.cpp
+++ b/twin/kcmtwin/twinrules/ruleswidget.cpp
@@ -41,9 +41,9 @@ namespace KWinInternal
{
#define SETUP( var, type ) \
- connect( enable_##var, TQT_SIGNAL( toggled( bool )), rule_##var, TQT_SLOT( setEnabled( bool ))); \
- connect( enable_##var, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( updateEnable##var())); \
- connect( rule_##var, TQT_SIGNAL( activated( int )), this, TQT_SLOT( updateEnable##var())); \
+ connect( enable_##var, TQ_SIGNAL( toggled( bool )), rule_##var, TQ_SLOT( setEnabled( bool ))); \
+ connect( enable_##var, TQ_SIGNAL( toggled( bool )), this, TQ_SLOT( updateEnable##var())); \
+ connect( rule_##var, TQ_SIGNAL( activated( int )), this, TQ_SLOT( updateEnable##var())); \
TQWhatsThis::add( enable_##var, enableDesc ); \
TQWhatsThis::add( rule_##var, type##RuleDesc );
@@ -550,7 +550,7 @@ void RulesWidget::detectClicked()
{
assert( detect_dlg == NULL );
detect_dlg = new DetectDialog;
- connect( detect_dlg, TQT_SIGNAL( detectionDone( bool )), this, TQT_SLOT( detected( bool )));
+ connect( detect_dlg, TQ_SIGNAL( detectionDone( bool )), this, TQ_SLOT( detected( bool )));
detect_dlg->detect( 0 );
}
@@ -702,7 +702,7 @@ Rules* RulesDialog::edit( Rules* r, WId window, bool show_hints )
if( window != 0 )
widget->prepareWindowSpecific( window );
if( show_hints )
- TQTimer::singleShot( 0, this, TQT_SLOT( displayHints()));
+ TQTimer::singleShot( 0, this, TQ_SLOT( displayHints()));
exec();
return rules;
}
diff --git a/twin/kcmtwin/twinrules/ruleswidget.h b/twin/kcmtwin/twinrules/ruleswidget.h
index 4d22e1826..4c4ef4be0 100644
--- a/twin/kcmtwin/twinrules/ruleswidget.h
+++ b/twin/kcmtwin/twinrules/ruleswidget.h
@@ -36,7 +36,7 @@ class DetectDialog;
class RulesWidget
: public RulesWidgetBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
RulesWidget( TQWidget* parent = NULL, const char* name = NULL );
void setRules( Rules* r );
@@ -97,7 +97,7 @@ class RulesWidget
class RulesDialog
: public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
RulesDialog( TQWidget* parent = NULL, const char* name = NULL );
Rules* edit( Rules* r, WId window, bool show_hints );
@@ -113,7 +113,7 @@ class RulesDialog
class EditShortcut
: public EditShortcutBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
EditShortcut( TQWidget* parent = NULL, const char* name = NULL );
protected:
@@ -124,7 +124,7 @@ class EditShortcut
class EditShortcutDialog
: public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
EditShortcutDialog( TQWidget* parent = NULL, const char* name = NULL );
void setShortcut( const TQString& cut );
@@ -137,7 +137,7 @@ class EditShortcutDialog
class ShortcutDialog
: public TDEShortcutDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
ShortcutDialog( const TDEShortcut& cut, TQWidget* parent = NULL, const char* name = NULL );
virtual void accept();
diff --git a/twin/kcmtwin/twinrules/ruleswidgetbase.ui b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
index 21486c4be..356a99676 100644
--- a/twin/kcmtwin/twinrules/ruleswidgetbase.ui
+++ b/twin/kcmtwin/twinrules/ruleswidgetbase.ui
@@ -216,9 +216,6 @@
<property name="text">
<string>Edit</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<spacer row="4" column="3" rowspan="1" colspan="2">
<property name="name">
@@ -487,9 +484,6 @@
<property name="text">
<string>Edit</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<spacer row="4" column="3">
<property name="name">
@@ -560,9 +554,6 @@
<property name="text">
<string>Edit</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<spacer row="7" column="3">
<property name="name">
@@ -633,9 +624,6 @@
<property name="text">
<string>Edit</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<spacer row="10" column="3">
<property name="name">
@@ -1869,9 +1857,6 @@
<property name="text">
<string>Shortcut</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="KComboBox" row="9" column="1">
<item>
@@ -1916,7 +1901,7 @@
<cstring>shortcut_edit</cstring>
</property>
<property name="text">
- <string>Edit...</string>
+ <string>Edit…</string>
</property>
</widget>
<widget class="KRestrictedLine" row="9" column="2" rowspan="1" colspan="3">
@@ -2292,9 +2277,6 @@
<property name="text">
<string>Strictly obey geometry</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="KComboBox" row="6" column="1">
<item>
@@ -2348,9 +2330,6 @@
<property name="text">
<string>Block global shortcuts</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</widget>
<widget class="KComboBox" row="7" column="1">
<item>
@@ -2530,7 +2509,7 @@
<tabstop>rule_disableglobalshortcuts</tabstop>
<tabstop>disableglobalshortcuts</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot access="protected" specifier="pure virtual">detectClicked()</slot>
<slot access="protected" specifier="pure virtual">wmclassMatchChanged()</slot>
<slot access="protected" specifier="pure virtual">roleMatchChanged()</slot>
@@ -2538,7 +2517,7 @@
<slot access="protected" specifier="pure virtual">extraMatchChanged()</slot>
<slot access="protected" specifier="pure virtual">machineMatchChanged()</slot>
<slot access="protected" specifier="pure virtual">shortcutEditClicked()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includes>
@@ -2546,8 +2525,6 @@
<include location="global" impldecl="in implementation">klineedit.h</include>
<include location="global" impldecl="in implementation">kpushbutton.h</include>
<include location="global" impldecl="in implementation">krestrictedline.h</include>
+ <include location="global" impldecl="in implementation">tdelistbox.h</include>
</includes>
-<includehints>
- <includehint>tdelistbox.h</includehint>
-</includehints>
</UI>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 02:11:54 +0000