summaryrefslogtreecommitdiffstats
path: root/khotkeys/kcontrol
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
commitfd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch)
tree9eda848e56fcb862fdfdf479adeccd95b6fe387a /khotkeys/kcontrol
parent02f67d0e1355b79b1806746efb0f2f640e57f13d (diff)
downloadtdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz
tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khotkeys/kcontrol')
-rw-r--r--khotkeys/kcontrol/action_list_widget.cpp2
-rw-r--r--khotkeys/kcontrol/actions_listview_widget.cpp2
-rw-r--r--khotkeys/kcontrol/condition_list_widget.cpp2
-rw-r--r--khotkeys/kcontrol/gesturedrawer.cpp20
-rw-r--r--khotkeys/kcontrol/gesturedrawer.h4
-rw-r--r--khotkeys/kcontrol/gesturerecorder.cpp2
-rw-r--r--khotkeys/kcontrol/gesturerecordpage.cpp2
-rw-r--r--khotkeys/kcontrol/gesturerecordpage.h2
-rw-r--r--khotkeys/kcontrol/kcmkhotkeys.cpp4
-rw-r--r--khotkeys/kcontrol/khotkeys.desktop2
-rw-r--r--khotkeys/kcontrol/main_buttons_widget.cpp2
-rw-r--r--khotkeys/kcontrol/menuedit.cpp2
-rw-r--r--khotkeys/kcontrol/tab_widget.cpp2
-rw-r--r--khotkeys/kcontrol/triggers_tab.cpp4
-rw-r--r--khotkeys/kcontrol/ui/action_group_tab_ui.ui8
-rw-r--r--khotkeys/kcontrol/ui/action_list_widget_ui.ui8
-rw-r--r--khotkeys/kcontrol/ui/actions_listview_widget_ui.ui6
-rw-r--r--khotkeys/kcontrol/ui/command_url_widget_ui.ui8
-rw-r--r--khotkeys/kcontrol/ui/condition_list_widget_ui.ui8
-rw-r--r--khotkeys/kcontrol/ui/dcop_widget_ui.ui20
-rw-r--r--khotkeys/kcontrol/ui/general_settings_tab_ui.ui14
-rw-r--r--khotkeys/kcontrol/ui/general_tab_ui.ui10
-rw-r--r--khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui44
-rw-r--r--khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui12
-rw-r--r--khotkeys/kcontrol/ui/info_tab_ui.ui10
-rw-r--r--khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui6
-rw-r--r--khotkeys/kcontrol/ui/main_buttons_widget_ui.ui6
-rw-r--r--khotkeys/kcontrol/ui/menuentry_widget_ui.ui8
-rw-r--r--khotkeys/kcontrol/ui/triggers_tab_ui.ui8
-rw-r--r--khotkeys/kcontrol/ui/voice_input_widget_ui.ui6
-rw-r--r--khotkeys/kcontrol/ui/voice_settings_tab_ui.ui12
-rw-r--r--khotkeys/kcontrol/ui/window_trigger_widget_ui.ui6
-rw-r--r--khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui8
-rw-r--r--khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui20
-rw-r--r--khotkeys/kcontrol/voicerecordpage.cpp2
-rw-r--r--khotkeys/kcontrol/windowdef_list_widget.cpp2
36 files changed, 142 insertions, 142 deletions
diff --git a/khotkeys/kcontrol/action_list_widget.cpp b/khotkeys/kcontrol/action_list_widget.cpp
index 80d9d2031..95aa7db89 100644
--- a/khotkeys/kcontrol/action_list_widget.cpp
+++ b/khotkeys/kcontrol/action_list_widget.cpp
@@ -222,7 +222,7 @@ void Action_list_widget::edit_listview_item( Action_list_item* item_P )
{
item_P->set_action( new_action );
item_P->widthChanged( 0 );
- actions_listview->tqrepaintItem( item_P );
+ actions_listview->repaintItem( item_P );
}
delete dlg;
}
diff --git a/khotkeys/kcontrol/actions_listview_widget.cpp b/khotkeys/kcontrol/actions_listview_widget.cpp
index 093b7c7ca..5048289df 100644
--- a/khotkeys/kcontrol/actions_listview_widget.cpp
+++ b/khotkeys/kcontrol/actions_listview_widget.cpp
@@ -49,7 +49,7 @@ Actions_listview_widget::Actions_listview_widget( TQWidget* parent_P, const char
void Actions_listview_widget::action_name_changed( const TQString& )
{
current_action()->widthChanged( 0 );
- actions_listview->tqrepaintItem( current_action());
+ actions_listview->repaintItem( current_action());
}
void Actions_listview_widget::set_action_data( Action_data_base* data_P, bool recent_action_P )
diff --git a/khotkeys/kcontrol/condition_list_widget.cpp b/khotkeys/kcontrol/condition_list_widget.cpp
index 5c7574a80..86ff8f47c 100644
--- a/khotkeys/kcontrol/condition_list_widget.cpp
+++ b/khotkeys/kcontrol/condition_list_widget.cpp
@@ -328,7 +328,7 @@ void Condition_list_widget::edit_listview_item( Condition_list_item* item_P )
conditions.insert( pos, new_condition );
}
item_P->widthChanged( 0 );
- conditions_listview->tqrepaintItem( item_P );
+ conditions_listview->repaintItem( item_P );
}
#ifdef KHOTKEYS_DEBUG
kdDebug( 1217 ) << "Condition_list_widget::edit_listview_item():" << endl;
diff --git a/khotkeys/kcontrol/gesturedrawer.cpp b/khotkeys/kcontrol/gesturedrawer.cpp
index d0d144382..817eeab89 100644
--- a/khotkeys/kcontrol/gesturedrawer.cpp
+++ b/khotkeys/kcontrol/gesturedrawer.cpp
@@ -20,7 +20,7 @@ namespace KHotKeys
GestureDrawer::GestureDrawer(TQWidget *parent, const char *name)
: TQFrame(parent, name), _data(TQString::null)
{
- setBackgroundColor( tqcolorGroup().base());
+ setBackgroundColor( colorGroup().base());
setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
setMinimumSize(30, 30);
}
@@ -33,14 +33,14 @@ void GestureDrawer::setData(const TQString &data)
{
_data = data;
- tqrepaint();
+ repaint();
}
void GestureDrawer::paintEvent(TQPaintEvent *ev)
{
// Iterate through the data points and draw a line to each of them
- TQ_UINT32 startCell = 0;
- TQ_UINT32 endCell = 0;
+ Q_UINT32 startCell = 0;
+ Q_UINT32 endCell = 0;
TQPoint startPoint;
TQPoint endPoint;
@@ -51,7 +51,7 @@ void GestureDrawer::paintEvent(TQPaintEvent *ev)
startCell = TQString(_data[0]).toUInt();
}
- for (TQ_UINT32 index = 1; index < _data.length(); ++index)
+ for (Q_UINT32 index = 1; index < _data.length(); ++index)
{
endCell = TQString(_data[index]).toUInt();
@@ -77,14 +77,14 @@ void GestureDrawer::paintEvent(TQPaintEvent *ev)
TQFrame::paintEvent(ev);
}
-TQPoint GestureDrawer::lookupCellCoords(TQ_UINT32 cell)
+TQPoint GestureDrawer::lookupCellCoords(Q_UINT32 cell)
{
// First divide the widget into thirds, horizontally and vertically
- TQ_UINT32 w = width();
- TQ_UINT32 h = height();
+ Q_UINT32 w = width();
+ Q_UINT32 h = height();
- TQ_UINT32 wThird = w / 3;
- TQ_UINT32 hThird = h / 3;
+ Q_UINT32 wThird = w / 3;
+ Q_UINT32 hThird = h / 3;
switch(cell)
{
diff --git a/khotkeys/kcontrol/gesturedrawer.h b/khotkeys/kcontrol/gesturedrawer.h
index 236c65ae3..50fe5db67 100644
--- a/khotkeys/kcontrol/gesturedrawer.h
+++ b/khotkeys/kcontrol/gesturedrawer.h
@@ -31,13 +31,13 @@ class GestureDrawer : public QFrame
void setData(const TQString &data);
- virtual TQSize tqsizeHint() const { return TQSize(30, 30); }
+ virtual TQSize sizeHint() const { return TQSize(30, 30); }
protected:
void paintEvent(TQPaintEvent *ev);
private:
- TQPoint lookupCellCoords(TQ_UINT32 cell);
+ TQPoint lookupCellCoords(Q_UINT32 cell);
void drawArrowHead(TQPoint &start, TQPoint &end,
TQPainter &p);
diff --git a/khotkeys/kcontrol/gesturerecorder.cpp b/khotkeys/kcontrol/gesturerecorder.cpp
index df5cf8940..58a177910 100644
--- a/khotkeys/kcontrol/gesturerecorder.cpp
+++ b/khotkeys/kcontrol/gesturerecorder.cpp
@@ -20,7 +20,7 @@ namespace KHotKeys
GestureRecorder::GestureRecorder(TQWidget *parent, const char *name)
: TQFrame(parent, name), _mouseButtonDown(false)
{
- setBackgroundColor( tqcolorGroup().base());
+ setBackgroundColor( colorGroup().base());
setFrameStyle(TQFrame::Sunken | TQFrame::Panel);
setLineWidth(2);
setMidLineWidth(0);
diff --git a/khotkeys/kcontrol/gesturerecordpage.cpp b/khotkeys/kcontrol/gesturerecordpage.cpp
index ef59a4a99..af2fb8cdc 100644
--- a/khotkeys/kcontrol/gesturerecordpage.cpp
+++ b/khotkeys/kcontrol/gesturerecordpage.cpp
@@ -43,7 +43,7 @@ GestureRecordPage::GestureRecordPage(const TQString &gesture,
"button below.\n\nDraw here:");
TQLabel *label = new TQLabel(message, this, "label");
- label->tqsetAlignment(TQLabel::AlignLeft | TQLabel::WordBreak |
+ label->setAlignment(TQLabel::AlignLeft | TQLabel::WordBreak |
TQLabel::AlignVCenter);
_recorder = new GestureRecorder(this, "recorder");
diff --git a/khotkeys/kcontrol/gesturerecordpage.h b/khotkeys/kcontrol/gesturerecordpage.h
index 36e0350ae..99242c518 100644
--- a/khotkeys/kcontrol/gesturerecordpage.h
+++ b/khotkeys/kcontrol/gesturerecordpage.h
@@ -53,7 +53,7 @@ class GestureRecordPage : public QVBox
TQString _gest;
- TQ_UINT32 _tryCount;
+ Q_UINT32 _tryCount;
};
} // namespace KHotKeys
diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp
index 264bfd032..5d540d4c9 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.cpp
+++ b/khotkeys/kcontrol/kcmkhotkeys.cpp
@@ -272,14 +272,14 @@ void Module::set_gestures_exclude( Windowdef_list* windows )
void Module::import()
{
- TQString file = KFileDialog::getOpenFileName( TQString::null, "*.khotkeys", tqtopLevelWidget(),
+ TQString file = KFileDialog::getOpenFileName( TQString::null, "*.khotkeys", topLevelWidget(),
i18n( "Select File with Actions to Be Imported" ));
if( file.isEmpty())
return;
KSimpleConfig cfg( file, true );
if( !settings.import( cfg, true ))
{
- KMessageBox::error( tqtopLevelWidget(),
+ KMessageBox::error( topLevelWidget(),
i18n( "Import of the specified file failed. Most probably the file is not a valid "
"file with actions." ));
return;
diff --git a/khotkeys/kcontrol/khotkeys.desktop b/khotkeys/kcontrol/khotkeys.desktop
index 3b433608e..f5781da2b 100644
--- a/khotkeys/kcontrol/khotkeys.desktop
+++ b/khotkeys/kcontrol/khotkeys.desktop
@@ -153,7 +153,7 @@ Keywords[cs]=Klávesy,Globální klávesové zkratky,Schéma kláves,Klávesové
Keywords[csb]=klawisze,globalné klawiszowé skrodzënë,schemë skrodzënów,gestë,mësz
Keywords[cy]=Bysyll,Bysellau,Rhwymiadau bysell eang,Ystumiau,Ystumiau llygoden
Keywords[da]=Taster,Globale tastebindinger,Tastebindinger,Gester,Muse-gester
-Keywords[de]=Tasten,Tastenzuordnung,Tastenkürzel,Kurzbefehle,Tastenschema,Tastaturtqlayout,Gesten,Mausgesten
+Keywords[de]=Tasten,Tastenzuordnung,Tastenkürzel,Kurzbefehle,Tastenschema,Tastaturlayout,Gesten,Mausgesten
Keywords[el]=Πλήκτρα,Καθολικοί συνδυασμοί πλήκτρων,Συνδυασμοί πλήκτρων,Gestures,Mouse gestures
Keywords[eo]=klavoj,malloka,signifoj,asocioj,kombinoj,klavkombinoj,muzo
Keywords[es]=Teclas,Asociaciones de teclas globales,Asociaciones de teclas,Gestos,Gestos del ratón
diff --git a/khotkeys/kcontrol/main_buttons_widget.cpp b/khotkeys/kcontrol/main_buttons_widget.cpp
index ec0671e40..3532cc13f 100644
--- a/khotkeys/kcontrol/main_buttons_widget.cpp
+++ b/khotkeys/kcontrol/main_buttons_widget.cpp
@@ -38,7 +38,7 @@ Main_buttons_widget::Main_buttons_widget( TQWidget* parent_P, const char* name_P
module, TQT_SLOT( changed()));
connect( delete_action_button, TQT_SIGNAL( clicked()),
module, TQT_SLOT( changed()));
- setMaximumHeight( tqsizeHint().height()); // it gets too high and I have no idea why
+ setMaximumHeight( sizeHint().height()); // it gets too high and I have no idea why
}
void Main_buttons_widget::enable_delete( bool enable_P )
diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp
index 203a32edf..199f59750 100644
--- a/khotkeys/kcontrol/menuedit.cpp
+++ b/khotkeys/kcontrol/menuedit.cpp
@@ -279,7 +279,7 @@ TQString khotkeys_change_menu_entry_shortcut( const TQString& entry_P,
}
else
{
- // erase the trigger, i.e. tqreplace with a copy with no trigger and no parent yet
+ // erase the trigger, i.e. replace with a copy with no trigger and no parent yet
Menuentry_shortcut_action_data* entry_tmp = new Menuentry_shortcut_action_data( NULL,
entry->name(), entry->comment(), entry->enabled( false ));
entry_tmp->set_action( new Menuentry_action( entry_tmp, entry_P ));
diff --git a/khotkeys/kcontrol/tab_widget.cpp b/khotkeys/kcontrol/tab_widget.cpp
index 7f8aa1396..243543519 100644
--- a/khotkeys/kcontrol/tab_widget.cpp
+++ b/khotkeys/kcontrol/tab_widget.cpp
@@ -434,7 +434,7 @@ const char* const Tab_widget::tab_labels[ Tab_widget::TAB_END ] = {
void Tab_widget::show_pages( const Pages_set& pages_P )
{
- hide(); // this seems to be necessary, otherwise it's not tqrepainter properly
+ hide(); // this seems to be necessary, otherwise it's not repainter properly
for( tab_pos_t i = TAB_FIRST;
i < TAB_END;
++i )
diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp
index 12cd12452..2533b58a0 100644
--- a/khotkeys/kcontrol/triggers_tab.cpp
+++ b/khotkeys/kcontrol/triggers_tab.cpp
@@ -241,8 +241,8 @@ void Shortcut_trigger_widget::clear_data()
void Shortcut_trigger_widget::capturedShortcut( const KShortcut& s_P )
{
- if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, tqtopLevelWidget())
- || KKeyChooser::checkStandardShortcutsConflict( s_P, true, tqtopLevelWidget()))
+ if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, topLevelWidget())
+ || KKeyChooser::checkStandardShortcutsConflict( s_P, true, topLevelWidget()))
return;
// KHotKeys::Module::changed()
module->changed();
diff --git a/khotkeys/kcontrol/ui/action_group_tab_ui.ui b/khotkeys/kcontrol/ui/action_group_tab_ui.ui
index 398827bbd..ad4bcceaf 100644
--- a/khotkeys/kcontrol/ui/action_group_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/action_group_tab_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>Action_group_tab_ui</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -48,7 +48,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -73,7 +73,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -101,7 +101,7 @@
<slots>
<slot access="protected" specifier="pure virtual">action_group_name_changed( const QString&amp; )</slot>
</slots>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>ktextedit.h</includehint>
</includehints>
diff --git a/khotkeys/kcontrol/ui/action_list_widget_ui.ui b/khotkeys/kcontrol/ui/action_list_widget_ui.ui
index a56ca10a4..696b5106a 100644
--- a/khotkeys/kcontrol/ui/action_list_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/action_list_widget_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>Action_list_widget_ui</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -40,7 +40,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -166,6 +166,6 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui b/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui
index d5646acba..7c0a88a6f 100644
--- a/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>Actions_listview_widget_ui</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -78,6 +78,6 @@
<include location="global" impldecl="in implementation">kdialog.h</include>
<include location="global" impldecl="in implementation">config.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/khotkeys/kcontrol/ui/command_url_widget_ui.ui b/khotkeys/kcontrol/ui/command_url_widget_ui.ui
index c88e7247e..266dd90d9 100644
--- a/khotkeys/kcontrol/ui/command_url_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/command_url_widget_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>Command_url_widget_ui</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -24,7 +24,7 @@
</property>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<vbox>
<property name="name">
@@ -56,8 +56,8 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
index c5ca0f0e7..a64ef33c1 100644
--- a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>Condition_list_widget_ui</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -40,7 +40,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@@ -165,6 +165,6 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/khotkeys/kcontrol/ui/dcop_widget_ui.ui b/khotkeys/kcontrol/ui/dcop_widget_ui.ui
index d4a55cdee..ed6e90337 100644
--- a/khotkeys/kcontrol/ui/dcop_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/dcop_widget_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>Dcop_widget_ui</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -48,7 +48,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
@@ -81,7 +81,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
@@ -114,7 +114,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
@@ -147,7 +147,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
@@ -178,7 +178,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -203,7 +203,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -228,7 +228,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -268,6 +268,6 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui
index d7db19733..60dc34237 100644
--- a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>General_settings_tab_ui</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -26,7 +26,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -42,7 +42,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -67,7 +67,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -86,7 +86,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -109,8 +109,8 @@
<slots>
<slot access="protected" specifier="pure virtual">import_clicked()</slot>
</slots>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kpushbutton.h</includehint>
</includehints>
diff --git a/khotkeys/kcontrol/ui/general_tab_ui.ui b/khotkeys/kcontrol/ui/general_tab_ui.ui
index f386b30d6..93f3a6a2c 100644
--- a/khotkeys/kcontrol/ui/general_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/general_tab_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>General_tab_ui</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -80,7 +80,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -105,7 +105,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -140,8 +140,8 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>ktextedit.h</includehint>
</includehints>
diff --git a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui
index 8a4dc33f4..29f8f88d5 100644
--- a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>Gesture_triggers_tab_ui</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>30</height>
@@ -77,7 +77,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -102,7 +102,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -121,7 +121,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>100</height>
@@ -138,7 +138,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -163,7 +163,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -182,7 +182,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>30</height>
@@ -213,7 +213,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -238,7 +238,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -257,7 +257,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>100</height>
@@ -274,7 +274,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -299,7 +299,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -318,7 +318,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>30</height>
@@ -349,7 +349,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -374,7 +374,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -393,7 +393,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>100</height>
@@ -410,7 +410,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -435,7 +435,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>0</height>
@@ -454,7 +454,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>30</height>
@@ -514,6 +514,6 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui b/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui
index 6798d5d6e..3bee7daf0 100644
--- a/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>Gestures_settings_tab_ui</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -26,7 +26,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout1</cstring>
+ <cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@@ -52,7 +52,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -116,7 +116,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
@@ -152,8 +152,8 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>knuminput.h</includehint>
</includehints>
diff --git a/khotkeys/kcontrol/ui/info_tab_ui.ui b/khotkeys/kcontrol/ui/info_tab_ui.ui
index f8c4fa6a7..9f82ccdcc 100644
--- a/khotkeys/kcontrol/ui/info_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/info_tab_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>Info_tab_ui</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -33,7 +33,7 @@
<string>&lt;p&gt;This module allows configuring input actions, like mouse gestures, keyboard shortcuts for performing commands, launching applications or DCOP calls, and similar.&lt;/p&gt;
&lt;p&gt;&lt;b&gt;NOTE: &lt;/b&gt;If you are not an experienced user, you should be careful with modifying the actions, and should limit your changes mainly to enabling/disabling actions, and changing triggers.&lt;/p&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -47,7 +47,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -59,6 +59,6 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui
index 4f82823b0..f3947dd54 100644
--- a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>Keyboard_input_widget_ui</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -185,8 +185,8 @@
<slots>
<slot access="protected" specifier="pure virtual">modify_pressed()</slot>
</slots>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>ktextedit.h</includehint>
</includehints>
diff --git a/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui b/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui
index c88fb04b9..a46ee0a0f 100644
--- a/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>Main_buttons_widget_ui</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -81,6 +81,6 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui
index 2c97b461d..ae6c613f3 100644
--- a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>Menuentry_widget_ui</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -72,7 +72,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
@@ -95,6 +95,6 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/khotkeys/kcontrol/ui/triggers_tab_ui.ui b/khotkeys/kcontrol/ui/triggers_tab_ui.ui
index ae4450be8..13ac0530b 100644
--- a/khotkeys/kcontrol/ui/triggers_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/triggers_tab_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>Triggers_tab_ui</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -40,7 +40,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -166,6 +166,6 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui
index 4be6d001f..007610fca 100644
--- a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>Form1</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -28,7 +28,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
@@ -95,7 +95,7 @@
<slot access="protected" specifier="pure virtual">slotPlayPressed()</slot>
<slot access="protected" specifier="pure virtual">slotStopPressed()</slot>
</slots>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui b/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui
index a9fa76b94..2c254dcc8 100644
--- a/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>Voice_settings_tab_ui</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -23,13 +23,13 @@
<property name="text">
<string>In order to trigger a spoken action, you have to press the key (or combination of keys) configured below, speak the command and then press the same key again once you have finished speaking.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -61,7 +61,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>241</width>
<height>21</height>
@@ -80,7 +80,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>90</height>
@@ -100,7 +100,7 @@ make sure &lt;i&gt;Full duplex&lt;/i&gt; is checked in your &lt;i&gt;Sound Syste
</widget>
<customwidgets>
</customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kkeybutton.h</includehint>
</includehints>
diff --git a/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui b/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui
index c49cced98..58d15e3cf 100644
--- a/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>Window_trigger_widget_ui</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -126,6 +126,6 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui
index 12a802be8..5e9007e9e 100644
--- a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>Windowdef_list_widget_ui</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -40,7 +40,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -165,6 +165,6 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui
index bc67b8efb..01d54da98 100644
--- a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>Windowdef_simple_widget_ui</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -48,7 +48,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
@@ -137,7 +137,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
@@ -226,7 +226,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
@@ -315,7 +315,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
@@ -346,7 +346,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -371,7 +371,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -390,7 +390,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>0</width>
<height>20</height>
@@ -488,6 +488,6 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/khotkeys/kcontrol/voicerecordpage.cpp b/khotkeys/kcontrol/voicerecordpage.cpp
index fa103e6b1..fec07e22f 100644
--- a/khotkeys/kcontrol/voicerecordpage.cpp
+++ b/khotkeys/kcontrol/voicerecordpage.cpp
@@ -31,7 +31,7 @@ VoiceRecordPage::VoiceRecordPage( const TQString &voiceid_P, TQWidget *parent, c
_message = i18n("Enter a code for the sound (e.g. the word you are saying) and record the same word twice.");
_label = new TQLabel(_message, this, "label");
- _label->tqsetAlignment(TQLabel::AlignLeft | TQLabel::WordBreak |
+ _label->setAlignment(TQLabel::AlignLeft | TQLabel::WordBreak |
TQLabel::AlignVCenter);
_lineEdit = new KLineEdit( this );
diff --git a/khotkeys/kcontrol/windowdef_list_widget.cpp b/khotkeys/kcontrol/windowdef_list_widget.cpp
index cad3437ec..471aab743 100644
--- a/khotkeys/kcontrol/windowdef_list_widget.cpp
+++ b/khotkeys/kcontrol/windowdef_list_widget.cpp
@@ -192,7 +192,7 @@ void Windowdef_list_widget::edit_listview_item( Windowdef_list_item* item_P )
{
item_P->set_window( new_window );
item_P->widthChanged( 0 ); // SELI tohle i u dalsich listview?
- windows_listview->tqrepaintItem( item_P );
+ windows_listview->repaintItem( item_P );
}
delete dlg;
}