summaryrefslogtreecommitdiffstats
path: root/kwin/kcmkwin
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 /kwin/kcmkwin
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 'kwin/kcmkwin')
-rw-r--r--kwin/kcmkwin/kwindecoration/buttons.cpp78
-rw-r--r--kwin/kcmkwin/kwindecoration/buttons.h2
-rw-r--r--kwin/kcmkwin/kwindecoration/kwindecoration.cpp18
-rw-r--r--kwin/kcmkwin/kwindecoration/kwindecoration.desktop38
-rw-r--r--kwin/kcmkwin/kwindecoration/preview.cpp24
-rw-r--r--kwin/kcmkwin/kwindecoration/preview.h4
-rw-r--r--kwin/kcmkwin/kwinoptions/ChangeLog6
-rw-r--r--kwin/kcmkwin/kwinoptions/main.cpp24
-rw-r--r--kwin/kcmkwin/kwinoptions/mouse.cpp78
-rw-r--r--kwin/kcmkwin/kwinoptions/windows.cpp32
-rw-r--r--kwin/kcmkwin/kwinoptions/windows.h2
-rw-r--r--kwin/kcmkwin/kwinrules/detectwidget.cpp4
-rw-r--r--kwin/kcmkwin/kwinrules/detectwidgetbase.ui8
-rw-r--r--kwin/kcmkwin/kwinrules/editshortcutbase.ui14
-rw-r--r--kwin/kcmkwin/kwinrules/kcm.cpp4
-rw-r--r--kwin/kcmkwin/kwinrules/kwinrules.desktop4
-rw-r--r--kwin/kcmkwin/kwinrules/main.cpp2
-rw-r--r--kwin/kcmkwin/kwinrules/ruleslistbase.ui8
-rw-r--r--kwin/kcmkwin/kwinrules/ruleswidget.cpp24
-rw-r--r--kwin/kcmkwin/kwinrules/ruleswidget.h4
-rw-r--r--kwin/kcmkwin/kwinrules/ruleswidgetbase.ui72
21 files changed, 225 insertions, 225 deletions
diff --git a/kwin/kcmkwin/kwindecoration/buttons.cpp b/kwin/kcmkwin/kwindecoration/buttons.cpp
index 42c618bd2..5d1d96d85 100644
--- a/kwin/kcmkwin/kwindecoration/buttons.cpp
+++ b/kwin/kcmkwin/kwindecoration/buttons.cpp
@@ -54,7 +54,7 @@ ButtonDrag::ButtonDrag( Button btn, TQWidget* parent, const char* name)
TQDataStream stream(data, IO_WriteOnly);
stream << btn.name;
stream << btn.icon;
- stream << btn.type.tqunicode();
+ stream << btn.type.unicode();
stream << (int) btn.duplicate;
stream << (int) btn.supported;
setEncodedData( data );
@@ -123,7 +123,7 @@ TQPixmap bitmapPixmap(const TQBitmap& bm, const TQColor& color)
ButtonSource::ButtonSource(TQWidget *parent, const char* name)
: KListView(parent, name)
{
- tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+ setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
setResizeMode(TQListView::AllColumns);
setDragEnabled(true);
@@ -140,19 +140,19 @@ ButtonSource::~ButtonSource()
{
}
-TQSize ButtonSource::tqsizeHint() const
+TQSize ButtonSource::sizeHint() const
{
- // make the tqsizeHint height a bit smaller than the one of TQListView...
+ // make the sizeHint height a bit smaller than the one of TQListView...
if ( cachedSizeHint().isValid() )
return cachedSizeHint();
constPolish();
- TQSize s( header()->tqsizeHint() );
+ TQSize s( header()->sizeHint() );
if ( verticalScrollBar()->isVisible() )
- s.setWidth( s.width() + style().tqpixelMetric(TQStyle::PM_ScrollBarExtent) );
+ s.setWidth( s.width() + style().pixelMetric(TQStyle::PM_ScrollBarExtent) );
s += TQSize(frameWidth()*2,frameWidth()*2);
// size hint: 4 lines of text...
@@ -218,7 +218,7 @@ TQDragObject *ButtonSource::dragObject()
if (i) {
ButtonDrag *bd = new ButtonDrag(i->button(), viewport(), "button_drag");
- bd->setPixmap(bitmapPixmap(i->button().icon, tqcolorGroup().foreground() ));
+ bd->setPixmap(bitmapPixmap(i->button().icon, colorGroup().foreground() ));
return bd;
}
@@ -306,15 +306,15 @@ void ButtonDropSite::clearRight()
void ButtonDropSite::dragMoveEvent( TQDragMoveEvent* e )
{
TQPoint p = e->pos();
- if (leftDropArea().tqcontains(p) || rightDropArea().tqcontains(p) || buttonAt(p) ) {
+ if (leftDropArea().contains(p) || rightDropArea().contains(p) || buttonAt(p) ) {
e->accept();
// 2 pixel wide drop visualizer...
TQRect r = contentsRect();
int x = -1;
- if (leftDropArea().tqcontains(p) ) {
+ if (leftDropArea().contains(p) ) {
x = leftDropArea().left();
- } else if (rightDropArea().tqcontains(p) ) {
+ } else if (rightDropArea().contains(p) ) {
x = rightDropArea().right()+1;
} else {
ButtonDropSiteItem *item = buttonAt(p);
@@ -373,10 +373,10 @@ void ButtonDropSite::dropEvent( TQDropEvent* e )
ButtonList *buttonList = 0;
ButtonList::iterator buttonPosition;
- if (leftDropArea().tqcontains(p) ) {
+ if (leftDropArea().contains(p) ) {
buttonList = &buttonsLeft;
buttonPosition = buttonsLeft.end();
- } else if (rightDropArea().tqcontains(p) ) {
+ } else if (rightDropArea().contains(p) ) {
buttonList = &buttonsRight;
buttonPosition = buttonsRight.begin();
} else {
@@ -487,7 +487,7 @@ void ButtonDropSite::mousePressEvent( TQMouseEvent* e )
m_selected = buttonAt(e->pos() );
if (m_selected) {
ButtonDrag *bd = new ButtonDrag(m_selected->button(), this);
- bd->setPixmap(bitmapPixmap(m_selected->button().icon, tqcolorGroup().foreground() ) );
+ bd->setPixmap(bitmapPixmap(m_selected->button().icon, colorGroup().foreground() ) );
bd->dragMove();
}
}
@@ -501,7 +501,7 @@ void ButtonDropSite::recalcItemGeometry()
{
TQRect r = contentsRect();
- // update the tqgeometry of the items in the left button list
+ // update the geometry of the items in the left button list
int offset = r.left();
for (ButtonList::const_iterator it = buttonsLeft.begin(); it != buttonsLeft.end(); ++it) {
int w = (*it)->width();
@@ -521,14 +521,14 @@ void ButtonDropSite::recalcItemGeometry()
ButtonDropSiteItem *ButtonDropSite::buttonAt(TQPoint p) {
// try to find the item in the left button list
for (ButtonList::const_iterator it = buttonsLeft.begin(); it != buttonsLeft.end(); ++it) {
- if ( (*it)->rect.tqcontains(p) ) {
+ if ( (*it)->rect.contains(p) ) {
return *it;
}
}
// try to find the item in the right button list
for (ButtonList::const_iterator it = buttonsRight.begin(); it != buttonsRight.end(); ++it) {
- if ( (*it)->rect.tqcontains(p) ) {
+ if ( (*it)->rect.contains(p) ) {
return *it;
}
}
@@ -572,7 +572,7 @@ bool ButtonDropSite::removeSelectedButton()
delete m_selected;
m_selected = 0;
recalcItemGeometry();
- update(); // tqrepaint...
+ update(); // repaint...
}
return succ;
@@ -581,9 +581,9 @@ bool ButtonDropSite::removeSelectedButton()
void ButtonDropSite::drawButtonList(TQPainter *p, const ButtonList& btns, int offset)
{
for (ButtonList::const_iterator it = btns.begin(); it != btns.end(); ++it) {
- TQRect tqitemRect = (*it)->rect;
- if (tqitemRect.isValid() ) {
- (*it)->draw(p, tqcolorGroup(), tqitemRect);
+ TQRect itemRect = (*it)->rect;
+ if (itemRect.isValid() ) {
+ (*it)->draw(p, colorGroup(), itemRect);
}
offset += (*it)->width();
}
@@ -610,7 +610,7 @@ void ButtonDropSite::drawContents( TQPainter* p )
p->setFont( TQFont( KGlobalSettings::generalFont().family(), 12, TQFont::Bold) );
p->drawText( r, AlignLeft | AlignVCenter, i18n("KDE") );
- offset = tqgeometry().width() - 3 - rightoffset;
+ offset = geometry().width() - 3 - rightoffset;
drawButtonList( p, buttonsRight, offset );
if (m_oldDropVisualizer.isValid() )
@@ -674,20 +674,20 @@ ButtonPositionWidget::ButtonPositionWidget(TQWidget *parent, const char* name)
: TQWidget(parent,name),
m_factory(0)
{
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint() );
- tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum);
+ TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint() );
+ setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum);
TQLabel* label = new TQLabel( this );
m_dropSite = new ButtonDropSite( this );
- label->tqsetAlignment( int( TQLabel::WordBreak ) );
+ label->setAlignment( int( TQLabel::WordBreak ) );
label->setText( i18n( "To add or remove titlebar buttons, simply <i>drag</i> items "
"between the available item list and the titlebar preview. Similarly, "
"drag items within the titlebar preview to re-position them.") );
m_buttonSource = new ButtonSource(this, "button_source");
- tqlayout->addWidget(label);
- tqlayout->addWidget(m_dropSite);
- tqlayout->addWidget(m_buttonSource);
+ layout->addWidget(label);
+ layout->addWidget(m_dropSite);
+ layout->addWidget(m_buttonSource);
connect( m_dropSite, TQT_SIGNAL(buttonAdded(TQChar)), m_buttonSource, TQT_SLOT(hideButton(TQChar)) );
connect( m_dropSite, TQT_SIGNAL(buttonRemoved(TQChar)), m_buttonSource, TQT_SLOT(showButton(TQChar)) );
@@ -761,7 +761,7 @@ void ButtonPositionWidget::setDecorationFactory(KDecorationFactory *factory)
ButtonSourceItem *i = dynamic_cast<ButtonSourceItem*>(it.current() );
if (i) {
Button b = i->button();
- b.supported = m_supportedButtons.tqcontains(b.type);
+ b.supported = m_supportedButtons.contains(b.type);
i->setButton(b);
}
++it;
@@ -777,47 +777,47 @@ Button ButtonPositionWidget::getButton(TQChar type, bool& success) {
if (type == 'R') {
TQBitmap bmp(resize_width, resize_height, resize_bits, true);
bmp.setMask(bmp);
- return Button(i18n("Resize"), bmp, 'R', false, m_supportedButtons.tqcontains('R') );
+ return Button(i18n("Resize"), bmp, 'R', false, m_supportedButtons.contains('R') );
} else if (type == 'L') {
TQBitmap bmp(shade_width, shade_height, shade_bits, true);
bmp.setMask(bmp);
- return Button(i18n("Shade"), bmp, 'L', false, m_supportedButtons.tqcontains('L') );
+ return Button(i18n("Shade"), bmp, 'L', false, m_supportedButtons.contains('L') );
} else if (type == 'B') {
TQBitmap bmp(keepbelowothers_width, keepbelowothers_height, keepbelowothers_bits, true);
bmp.setMask(bmp);
- return Button(i18n("Keep Below Others"), bmp, 'B', false, m_supportedButtons.tqcontains('B') );
+ return Button(i18n("Keep Below Others"), bmp, 'B', false, m_supportedButtons.contains('B') );
} else if (type == 'F') {
TQBitmap bmp(keepaboveothers_width, keepaboveothers_height, keepaboveothers_bits, true);
bmp.setMask(bmp);
- return Button(i18n("Keep Above Others"), bmp, 'F', false, m_supportedButtons.tqcontains('F') );
+ return Button(i18n("Keep Above Others"), bmp, 'F', false, m_supportedButtons.contains('F') );
} else if (type == 'X') {
TQBitmap bmp(close_width, close_height, close_bits, true);
bmp.setMask(bmp);
- return Button(i18n("Close"), bmp, 'X', false, m_supportedButtons.tqcontains('X') );
+ return Button(i18n("Close"), bmp, 'X', false, m_supportedButtons.contains('X') );
} else if (type == 'A') {
TQBitmap bmp(maximize_width, maximize_height, maximize_bits, true);
bmp.setMask(bmp);
- return Button(i18n("Maximize"), bmp, 'A', false, m_supportedButtons.tqcontains('A') );
+ return Button(i18n("Maximize"), bmp, 'A', false, m_supportedButtons.contains('A') );
} else if (type == 'I') {
TQBitmap bmp(minimize_width, minimize_height, minimize_bits, true);
bmp.setMask(bmp);
- return Button(i18n("Minimize"), bmp, 'I', false, m_supportedButtons.tqcontains('I') );
+ return Button(i18n("Minimize"), bmp, 'I', false, m_supportedButtons.contains('I') );
} else if (type == 'H') {
TQBitmap bmp(help_width, help_height, help_bits, true);
bmp.setMask(bmp);
- return Button(i18n("Help"), bmp, 'H', false, m_supportedButtons.tqcontains('H') );
+ return Button(i18n("Help"), bmp, 'H', false, m_supportedButtons.contains('H') );
} else if (type == 'S') {
TQBitmap bmp(onalldesktops_width, onalldesktops_height, onalldesktops_bits, true);
bmp.setMask(bmp);
- return Button(i18n("On All Desktops"), bmp, 'S', false, m_supportedButtons.tqcontains('S') );
+ return Button(i18n("On All Desktops"), bmp, 'S', false, m_supportedButtons.contains('S') );
} else if (type == 'M') {
TQBitmap bmp(menu_width, menu_height, menu_bits, true);
bmp.setMask(bmp);
- return Button(i18n("Menu"), bmp, 'M', false, m_supportedButtons.tqcontains('M') );
+ return Button(i18n("Menu"), bmp, 'M', false, m_supportedButtons.contains('M') );
} else if (type == '_') {
TQBitmap bmp(spacer_width, spacer_height, spacer_bits, true);
bmp.setMask(bmp);
- return Button(i18n("--- spacer ---"), bmp, '_', true, m_supportedButtons.tqcontains('_') );
+ return Button(i18n("--- spacer ---"), bmp, '_', true, m_supportedButtons.contains('_') );
} else {
success = false;
return Button();
diff --git a/kwin/kcmkwin/kwindecoration/buttons.h b/kwin/kcmkwin/kwindecoration/buttons.h
index 8786e4e23..0fcbff085 100644
--- a/kwin/kcmkwin/kwindecoration/buttons.h
+++ b/kwin/kcmkwin/kwindecoration/buttons.h
@@ -117,7 +117,7 @@ class ButtonSource : public KListView
ButtonSource(TQWidget *parent = 0, const char* name = 0);
virtual ~ButtonSource();
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
void hideAllButtons();
void showAllButtons();
diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp
index 33714ee08..193450086 100644
--- a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp
+++ b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp
@@ -75,14 +75,14 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
kwinConfig.setGroup("Style");
plugins = new KDecorationPreviewPlugins( &kwinConfig );
- TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+ TQVBoxLayout* layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
// Save this for later...
// cbUseMiniWindows = new TQCheckBox( i18n( "Render mini &titlebars for all windows"), checkGroup );
// TQWhatsThis::add( cbUseMiniWindows, i18n( "Note that this option is not available on all styles yet!" ) );
tabWidget = new TQTabWidget( this );
- tqlayout->addWidget( tabWidget );
+ layout->addWidget( tabWidget );
// Page 1 (General Options)
TQWidget *pluginPage = new TQWidget( tabWidget );
@@ -99,8 +99,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
TQGroupBox *pluginSettingsGrp = new TQGroupBox( i18n("Decoration Options"), pluginPage );
pluginSettingsGrp->setColumnLayout( 0, Vertical );
pluginSettingsGrp->setFlat( true );
- pluginSettingsGrp->tqlayout()->setMargin( 0 );
- pluginSettingsGrp->tqlayout()->setSpacing( KDialog::spacingHint() );
+ pluginSettingsGrp->layout()->setMargin( 0 );
+ pluginSettingsGrp->layout()->setSpacing( KDialog::spacingHint() );
pluginLayout->addWidget( pluginSettingsGrp );
pluginLayout->addStretch();
@@ -112,13 +112,13 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
TQWhatsThis::add( cBorder, i18n( "Use this combobox to change the border size of the decoration." ));
lBorder->hide();
cBorder->hide();
- TQHBoxLayout *borderSizeLayout = new TQHBoxLayout(pluginSettingsGrp->tqlayout() );
+ TQHBoxLayout *borderSizeLayout = new TQHBoxLayout(pluginSettingsGrp->layout() );
borderSizeLayout->addWidget(lBorder);
borderSizeLayout->addWidget(cBorder);
borderSizeLayout->addStretch();
pluginConfigWidget = new TQVBox(pluginSettingsGrp);
- pluginSettingsGrp->tqlayout()->add( pluginConfigWidget );
+ pluginSettingsGrp->layout()->add( pluginConfigWidget );
// Page 2 (Button Selector)
TQWidget* buttonPage = new TQWidget( tabWidget );
@@ -148,14 +148,14 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
// buttonLayout->addStretch();
// preview
- TQVBoxLayout* previewLayout = new TQVBoxLayout(tqlayout, KDialog::spacingHint() );
+ TQVBoxLayout* previewLayout = new TQVBoxLayout(layout, KDialog::spacingHint() );
previewLayout->setMargin( KDialog::marginHint() );
preview = new KDecorationPreview( this );
previewLayout->addWidget(preview);
- preview->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
- tabWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum);
+ preview->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+ tabWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum);
// Page 3 (Window Shadows)
TQHBox *inactiveShadowColourHBox, *shadowColourHBox;
diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.desktop b/kwin/kcmkwin/kwindecoration/kwindecoration.desktop
index 9057a6bd4..3c5f12e6f 100644
--- a/kwin/kcmkwin/kwindecoration/kwindecoration.desktop
+++ b/kwin/kcmkwin/kwindecoration/kwindecoration.desktop
@@ -162,16 +162,16 @@ Comment[zh_CN]=配置窗口标题的观感
Comment[zh_TW]=設定視窗標題列的外觀與感覺
Comment[zu]=Hlanganisela ukubona kanye nokuzwa kwezihloko zama-window
-Keywords=kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle,edge,kwm,decoration
+Keywords=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration
Keywords[ar]=kwin,نافذة,مسيير,الحافة,الشكل,سمة,مظهر,ملمس,تصميم,زر,معامل,مدبر,kwm,زخرفات
Keywords[az]=kwin,pəncərə,idarəçi,kənar,tərz,örtü,görünüş,toxuma,yer,düymə,applet,kənar,kwm,dekorasiya,bəzək
-Keywords[be]=Акно,Кіраўнік,Мяжа,Стыль,Тэма,Вонкавы выгляд,Кнопкі,Апрацоўшчык,Край,Дэкарацыя,kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle,edge,kwm,decoration
-Keywords[bg]=прозорец, декорация, заглавие, бутони, меню, kwin, window, manager, border, style, theme, look, feel, tqlayout, button, handle, edge, kwm, decoration
+Keywords[be]=Акно,Кіраўнік,Мяжа,Стыль,Тэма,Вонкавы выгляд,Кнопкі,Апрацоўшчык,Край,Дэкарацыя,kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration
+Keywords[bg]=прозорец, декорация, заглавие, бутони, меню, kwin, window, manager, border, style, theme, look, feel, layout, button, handle, edge, kwm, decoration
Keywords[ca]=kwin,finestra,gestor,vora,estil,tema,aspecte,comportament,disposició,botó,nansa,marges,kwm,decoració
Keywords[cs]=kwin,okno,správce,okraj,styl,motiv,vzhled,rozvržení,tlačítko,úchytka,hrana,kwm,dekorace
Keywords[csb]=kwin,òkno,menedżer,zberk,sztél,téma,wëzdrzatk,ùchòwanié,ùstôw,knąpa,ùchwët,rańt,kwm,dekòracëjô
Keywords[cy]=kwin,ffenestr,trefnydd,ymyl,arddull,thema,golwg,teimlad,haenlun,botwm,carn,kwm,addurniad
-Keywords[da]=kwin,vindue,håndtering,kant,stil,tema,udseende,fornemmelse,tqlayout,knap,håndtag,kant,kwm,dekoration
+Keywords[da]=kwin,vindue,håndtering,kant,stil,tema,udseende,fornemmelse,layout,knap,håndtag,kant,kwm,dekoration
Keywords[de]=KWin,Kwm,Fenster,Manager,Rahmen,Design,Stile,Themes,Optik,Erscheinungsbild,Layout,Knöpfe,Ränder,Dekorationen
Keywords[el]=kwin,παράθυρο,διαχειριστής,περίγραμμα,στυλ,θέμα,εμφάνιση,αίσθηση,διάταξη,κουμπί,χειρισμός,άκρο,kwm,διακόσμηση
Keywords[eo]=kwin,fenestro,administrilo,rando,stilo,etoso,aspekto,konduto,aranĝo,butono,eĝo,kwm,ornamo
@@ -181,26 +181,26 @@ Keywords[eu]=kwin,leihoa,kudeatzailea,ertza,estiloa,gaia,itxura,antolaketa,botoi
Keywords[fa]=kwin، پنجره، مدیر، لبه، سبک، چهره، ظاهر، احساس، طرح‌بندی، دکمه، گرداندن، لبه، kwm، تزئین
Keywords[fi]=kwin,ikkuna,ikkunaohjelma,ikkunoinnin hallintaohjelma,tausta,tyyli,teema,ulkonäkö,tuntuma,ulkoasu,painike,kahva,kulma,kwm,kehys
Keywords[fr]=kwin,fenêtre,gestionnaire,bordure,style,thème,apparence,ergonomie,disposition,bouton,poignée,bord,kwm,décoration
-Keywords[fy]=kwin,window,manager,rand,stijl,theme,tema,look,uiterlijk,gedrag,feel,tqlayout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheer,finster,râne,kader,styltema,uterlik,gedrach,finsterbehear
+Keywords[fy]=kwin,window,manager,rand,stijl,theme,tema,look,uiterlijk,gedrag,feel,layout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheer,finster,râne,kader,styltema,uterlik,gedrach,finsterbehear
Keywords[ga]=kwin,fuinneog,bainisteoir,imlíne,stíl,téama,leagan amach,cnaipe,hanla,ciumhais,kwm,maisiúchán
Keywords[gl]=kwin,fiestra,xestor,beira,estilo,tema,apariencia,formato,botón,xestión,esquina,kwm,decoración
-Keywords[he]=מנהל חלונות,חלונות,מנהל,גבול,מסגרת,סגנון,ערכה,ערכת נושא,מראה,תחושה,פריסה,תצוגה,כפתור,ידית,קצה,קישוט, kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle, edge,kwm,decoration
+Keywords[he]=מנהל חלונות,חלונות,מנהל,גבול,מסגרת,סגנון,ערכה,ערכת נושא,מראה,תחושה,פריסה,תצוגה,כפתור,ידית,קצה,קישוט, kwin,window,manager,border,style,theme,look,feel,layout,button,handle, edge,kwm,decoration
Keywords[hi]=के-विन,विंडो,प्रबंधक,बार्डर,शैली,प्रसंग,रूप,अनुभव,ले-आउट,बटन,हैंडल,किनारा,केडबल्यूएम,सजावट
-Keywords[hr]=kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle,edge,kwm,decoration,prozor,upravljanje,obrub,stil,tema,izgled,raspored,gumb,rukovanje,rub,ukras
+Keywords[hr]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,prozor,upravljanje,obrub,stil,tema,izgled,raspored,gumb,rukovanje,rub,ukras
Keywords[hu]=KWin,ablak,kezelő,szegély,stílus,téma,kinézet,megjelenés,elrendezés,nyomógomb,fogantyú,perem,kwm,ablakstílus
Keywords[is]=kwin,gluggi,gluggastjóri,gluggar,kantar,rammi,skreyting,þema,stíll,útlit,takki,kwm,skraut
Keywords[it]=kwin,finestra,window manager,bordo,stile,tema,aspetto,pulsante,maniglia,bordo,kwm,decorazione
Keywords[ja]=kwin,ウィンドウ,マネージャ,枠,スタイル,テーマ,ルック,外観,レイアウト,ボタン,ハンドル,エッジ,kwm,装飾
Keywords[km]=kwin,បង្អួច,កម្មវិធី​គ្រប់គ្រង,ស៊ុម,រចនាប័ទ្ម,ស្បែក,មុខងារ,ប្លង់,ប៊ូតុង,ការ​ប្រើ,គែម,kwm,ការ​តុបតែង
-Keywords[lt]=kwin,window,manager,border,style,theme,look,feel,tqlayout,buttons,handle,edge,kwm,decoration,langas,tvarkyklė,rėmelis,stilius,tema,žiūrėti,jausti,išdėstymas,mygtukai,kraštas,dekoracija
+Keywords[lt]=kwin,window,manager,border,style,theme,look,feel,layout,buttons,handle,edge,kwm,decoration,langas,tvarkyklė,rėmelis,stilius,tema,žiūrėti,jausti,išdėstymas,mygtukai,kraštas,dekoracija
Keywords[lv]=kwin, logs, menedžeris, rāmis, stils, tēma, skats, gars, izkārtojums, poga, rokturis, stūris, kwm, dekorācija
-Keywords[mk]=kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle,edge,kwm,decoration,прозорец,менаџер,граница,стил,тема,изглед,чувство,распоред,копче,рачка,раб,декорација
+Keywords[mk]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,прозорец,менаџер,граница,стил,тема,изглед,чувство,распоред,копче,рачка,раб,декорација
Keywords[mn]=KWin,Kwm,Цонх,Manager,Хүрээ,Design,Хэлбэр,Загвар, Optik,Харагдалт,Layout,Товч,Өнцөг,Засал
-Keywords[mt]=kwin, window, manager, border, bordura, stil, tema, apparenza, style, theme, look, feel, tqlayout, tqassim, użu, button, handle, edge, kwm, decoration
-Keywords[nb]=kwin,vindu,vindusstyring,styrer,ramme,stil,tema,utseende,tqlayout,knapp,kant,kwm,pynt,dekorasjon
-Keywords[nds]=kwin,Finster,Finsterpleger,manager,Rahmen,Stil,Muster,look,feel,tqlayout,Knoop,Greep,Rand,kwm,Dekoratschoon
+Keywords[mt]=kwin, window, manager, border, bordura, stil, tema, apparenza, style, theme, look, feel, layout, tqassim, użu, button, handle, edge, kwm, decoration
+Keywords[nb]=kwin,vindu,vindusstyring,styrer,ramme,stil,tema,utseende,layout,knapp,kant,kwm,pynt,dekorasjon
+Keywords[nds]=kwin,Finster,Finsterpleger,manager,Rahmen,Stil,Muster,look,feel,layout,Knoop,Greep,Rand,kwm,Dekoratschoon
Keywords[ne]=के विन,सञ्झ्याल, प्रबन्धक, किनारा, शैली, विषयवस्तु, हेराइ, बुझाइ, सजावट, बटन, ह्यान्डल, छेउ,kwm, सजावट
-Keywords[nl]=kwin,window,manager,rand,stijl,theme,thema,look,uiterlijk,gedrag,feel, tqlayout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheer
+Keywords[nl]=kwin,window,manager,rand,stijl,theme,thema,look,uiterlijk,gedrag,feel, layout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheer
Keywords[nn]=kwin,vindauge,kant,bord,stil,tema,utsjånad,bunad,knapp,handtak,kwm,dekorasjon
Keywords[nso]=kwin,window,molaodi,mollwane,mokgwa,molaetsa,tebelego,maikutlo,peakanyo,setobetswa,moswaro,nthla,kwm,kgabiso
Keywords[pa]=kwin,handle,edge,kwm,decoration,ਝਰੋਖਾ,ਮੈਨੇਜਰ,ਹਾਸ਼ੀਆ,ਸ਼ੈਲੀ,ਸਰੂਪ,ਦਿੱਖ,ਖਾਕਾ,ਬਟਨ,ਹੈਂਡਲ,ਸਜਾਵਟ
@@ -212,9 +212,9 @@ Keywords[rw]=kwin,idirishya,muyobozi,impera,imisusire,insanganyamatsiko,imboneko
Keywords[se]=kwin,láse,gieđahalli,ravda,stiila,fáddá,fárda,dovdu,hápmi,boallu,geavja,ravda,kwm,hearva
Keywords[sk]=kwin,okno,správa,okraj,štýl,téma,vzhľad,rozloženie,tlačidlo,hrana,kwm,dekorácia,oblasť
Keywords[sl]=kwin,okno,upravitelj,rob,meja,slog,stil,tema,pogled,občutek,gumb,ročaj,rob,kwm,okrasek
-Keywords[sr]=kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle,edge,kwm,decoration,прозор,менаџер,оквир,стил,тема,изглед,дугме,хватаљка,декорација
-Keywords[sr@Latn]=kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle,edge,kwm,decoration,prozor,menadžer,okvir,stil,tema,izgled,dugme,hvataljka,dekoracija
-Keywords[sv]=kwin,fönster,hanterare,kant,stil,tema,utseende,känsla,tqlayout,knapp,hantera,kant,kwm,dekoration
+Keywords[sr]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,прозор,менаџер,оквир,стил,тема,изглед,дугме,хватаљка,декорација
+Keywords[sr@Latn]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,prozor,menadžer,okvir,stil,tema,izgled,dugme,hvataljka,dekoracija
+Keywords[sv]=kwin,fönster,hanterare,kant,stil,tema,utseende,känsla,layout,knapp,hantera,kant,kwm,dekoration
Keywords[ta]=kwin,சாளரம்,மேலாளர்,விளிம்பு,பாணி,தலைப்பு,பார்வை,உணர்தல்,உருவரை,விசை,கையாள்,முனை,kwm,அலங்கரிப்பு
Keywords[th]=kwin,หน้าต่าง,ตัวจัดการ,กรอบ,ลักษณะ,ชุดตกแต่ง,มองเห็น,รู้สึก,การจัดวาง,ปุ่ม,ที่จับ,ขอบ,kwm,การตกแต่ง
Keywords[tr]=kwin,pencere,yönetici,kenar,stil,tema,görünüş,doku,yerleşim,düğme,tutamaç,kenar,kwm,dekorasyon
@@ -223,9 +223,9 @@ Keywords[uz]=kwin,kwm,bezak,oyna,boshqaruvchi,usul,tashqi koʻrinish
Keywords[uz@cyrillic]=kwin,kwm,безак,ойна,бошқарувчи,усул,ташқи кўриниш
Keywords[ven]=kwin,windo,mulanguli,mukanoni,tshitaela,thero,sedza,upfa,vhuvha,bathene,fara,mafhedziselo,kwn,u khavhisedza
Keywords[vi]=kwin,cửa sổ,quản lý,bờ,kiểu,sắc thái,ngoại hình,cảm nhận,sắp xếp,nút,điều khiển,cạnh,kwm,trang trí
-Keywords[wa]=kwin,kpurnea,purnea,manaedjeu,boird,stîle,tinme,rivnance,tqlayout;loukance,boton,apougnî,costé,kwm,gåliotaedje
+Keywords[wa]=kwin,kpurnea,purnea,manaedjeu,boird,stîle,tinme,rivnance,layout;loukance,boton,apougnî,costé,kwm,gåliotaedje
Keywords[xh]=kwin,window,umphathi,umda,uhlobo,umxholo wokuxoxwa,jonga,yiva,beka,iqhosha,umqheba,umda,kwm,uhombiso
-Keywords[zh_CN]=kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle,edge,kwm,decoration,窗口,管理器,边框,样式,主题,观感,布局,按钮,处理,边缘,装饰
-Keywords[zh_TW]=kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle,edge,kwm,decoration,視窗,管理員,邊框,風格,佈景主題,外觀,感覺,佈局,按鈕,邊緣,裝飾
+Keywords[zh_CN]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,窗口,管理器,边框,样式,主题,观感,布局,按钮,处理,边缘,装饰
+Keywords[zh_TW]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,視窗,管理員,邊框,風格,佈景主題,外觀,感覺,佈局,按鈕,邊緣,裝飾
Keywords[zu]=kwin,i-window,imenenja,umngcele,isitayela,bona,izwa, isendlalelo,inkinobho,isibambo,unqenqema,kwm,umhlobiso
Categories=Qt;KDE;X-KDE-settings-looknfeel;
diff --git a/kwin/kcmkwin/kwindecoration/preview.cpp b/kwin/kcmkwin/kwindecoration/preview.cpp
index 0993720cf..c9a0174f4 100644
--- a/kwin/kcmkwin/kwindecoration/preview.cpp
+++ b/kwin/kcmkwin/kwindecoration/preview.cpp
@@ -49,7 +49,7 @@ KDecorationPreview::KDecorationPreview( TQWidget* parent, const char* name )
"Most probably there\n"
"was a problem loading the plugin." ), this );
- no_preview->tqsetAlignment( AlignCenter );
+ no_preview->setAlignment( AlignCenter );
setMinimumSize( 100, 100 );
no_preview->resize( size());
@@ -109,7 +109,7 @@ void KDecorationPreview::positionPreviews()
{
int titleBarHeight, leftBorder, rightBorder, xoffset,
dummy1, dummy2, dummy3;
- TQRect tqgeometry;
+ TQRect geometry;
TQSize size;
no_preview->resize( this->size() );
@@ -127,15 +127,15 @@ void KDecorationPreview::positionPreviews()
// Resize the active window
size = TQSize( width() - xoffset, height() - titleBarHeight )
- .expandedTo( deco[Active]->tqminimumSize() );
- tqgeometry = TQRect( TQPoint( 0, titleBarHeight ), size );
- deco[Active]->widget()->setGeometry( TQStyle::tqvisualRect( tqgeometry, this ) );
+ .expandedTo( deco[Active]->minimumSize() );
+ geometry = TQRect( TQPoint( 0, titleBarHeight ), size );
+ deco[Active]->widget()->setGeometry( TQStyle::visualRect( geometry, this ) );
// Resize the inactive window
size = TQSize( width() - xoffset, height() - titleBarHeight )
- .expandedTo( deco[Inactive]->tqminimumSize() );
- tqgeometry = TQRect( TQPoint( xoffset, 0 ), size );
- deco[Inactive]->widget()->setGeometry( TQStyle::tqvisualRect( tqgeometry, this ) );
+ .expandedTo( deco[Inactive]->minimumSize() );
+ geometry = TQRect( TQPoint( xoffset, 0 ), size );
+ deco[Inactive]->widget()->setGeometry( TQStyle::visualRect( geometry, this ) );
}
void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool active )
@@ -166,13 +166,13 @@ void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool act
delete[] xrects;
}
if( active )
- tqmask = reg; // keep tqshape of the active window for unobscuredRegion()
+ mask = reg; // keep shape of the active window for unobscuredRegion()
}
TQRect KDecorationPreview::windowGeometry( bool active ) const
{
TQWidget *widget = active ? deco[Active]->widget() : deco[Inactive]->widget();
- return widget->tqgeometry();
+ return widget->geometry();
}
void KDecorationPreview::setTempBorderSize(KDecorationPlugins* plugin, KDecorationDefines::BorderSize size)
@@ -214,7 +214,7 @@ TQRegion KDecorationPreview::unobscuredRegion( bool active, const TQRegion& r )
{
// copied from KWin core's code
TQRegion ret = r;
- TQRegion r2 = tqmask;
+ TQRegion r2 = mask;
if( r2.isEmpty())
r2 = TQRegion( windowGeometry( true ));
r2.translate( windowGeometry( true ).x() - windowGeometry( false ).x(),
@@ -356,7 +356,7 @@ bool KDecorationPreviewBridge::isPreview() const
return true;
}
-TQRect KDecorationPreviewBridge::tqgeometry() const
+TQRect KDecorationPreviewBridge::geometry() const
{
return preview->windowGeometry( active );
}
diff --git a/kwin/kcmkwin/kwindecoration/preview.h b/kwin/kcmkwin/kwindecoration/preview.h
index 002ec5de1..5604df587 100644
--- a/kwin/kcmkwin/kwindecoration/preview.h
+++ b/kwin/kcmkwin/kwindecoration/preview.h
@@ -57,7 +57,7 @@ class KDecorationPreview
KDecorationPreviewBridge* bridge[NumWindows];
KDecoration* deco[NumWindows];
TQLabel* no_preview;
- TQRegion tqmask;
+ TQRegion mask;
};
class KDecorationPreviewBridge
@@ -89,7 +89,7 @@ class KDecorationPreviewBridge
virtual void performWindowOperation( WindowOperation );
virtual void setMask( const TQRegion&, int );
virtual bool isPreview() const;
- virtual TQRect tqgeometry() const;
+ virtual TQRect geometry() const;
virtual TQRect iconGeometry() const;
virtual TQRegion unobscuredRegion( const TQRegion& r ) const;
virtual TQWidget* workspaceWidget() const;
diff --git a/kwin/kcmkwin/kwinoptions/ChangeLog b/kwin/kcmkwin/kwinoptions/ChangeLog
index 612331796..0b923864c 100644
--- a/kwin/kcmkwin/kwinoptions/ChangeLog
+++ b/kwin/kcmkwin/kwinoptions/ChangeLog
@@ -23,7 +23,7 @@
1998-11-06 Cristian Tibirna <ctibirna@gch.ulaval.ca>
- * titlebar.[cpp,h] : added title tqalignment config
+ * titlebar.[cpp,h] : added title alignment config
1998-10-23 Cristian Tibirna <ctibirna@gch.ulaval.ca>
@@ -37,12 +37,12 @@
1998-10-21 Cristian Tibirna <ctibirna@gch.ulaval.ca>
- * desktop.[cpp,h]: now with consistent tqlayout use
+ * desktop.[cpp,h]: now with consistent layout use
resizeEvent() deleted
1998-10-19 Cristian Tibirna <ctibirna@gch.ulaval.ca>
- * windows.[cpp,h]: now with consistent tqlayout use
+ * windows.[cpp,h]: now with consistent layout use
resizeEvent() deleted
1998-10-18 Cristian Tibirna <ctibirna@gch.ulaval.ca>
diff --git a/kwin/kcmkwin/kwinoptions/main.cpp b/kwin/kcmkwin/kwinoptions/main.cpp
index dc8273f25..ac19a5d30 100644
--- a/kwin/kcmkwin/kwinoptions/main.cpp
+++ b/kwin/kcmkwin/kwinoptions/main.cpp
@@ -88,37 +88,37 @@ KWinOptions::KWinOptions(TQWidget *parent, const char *name)
{
mConfig = new KConfig("kwinrc", false, true);
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
tab = new TQTabWidget(this);
- tqlayout->addWidget(tab);
+ layout->addWidget(tab);
mFocus = new KFocusConfig(false, mConfig, this, "KWin Focus Config");
- mFocus->tqlayout()->setMargin( KDialog::marginHint() );
+ mFocus->layout()->setMargin( KDialog::marginHint() );
tab->addTab(mFocus, i18n("&Focus"));
connect(mFocus, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
mTitleBarActions = new KTitleBarActionsConfig(false, mConfig, this, "KWin TitleBar Actions");
- mTitleBarActions->tqlayout()->setMargin( KDialog::marginHint() );
+ mTitleBarActions->layout()->setMargin( KDialog::marginHint() );
tab->addTab(mTitleBarActions, i18n("&Titlebar Actions"));
connect(mTitleBarActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
mWindowActions = new KWindowActionsConfig(false, mConfig, this, "KWin Window Actions");
- mWindowActions->tqlayout()->setMargin( KDialog::marginHint() );
+ mWindowActions->layout()->setMargin( KDialog::marginHint() );
tab->addTab(mWindowActions, i18n("Window Actio&ns"));
connect(mWindowActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
mMoving = new KMovingConfig(false, mConfig, this, "KWin Moving");
- mMoving->tqlayout()->setMargin( KDialog::marginHint() );
+ mMoving->layout()->setMargin( KDialog::marginHint() );
tab->addTab(mMoving, i18n("&Moving"));
connect(mMoving, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
mAdvanced = new KAdvancedConfig(false, mConfig, this, "KWin Advanced");
- mAdvanced->tqlayout()->setMargin( KDialog::marginHint() );
+ mAdvanced->layout()->setMargin( KDialog::marginHint() );
tab->addTab(mAdvanced, i18n("Ad&vanced"));
connect(mAdvanced, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
mTranslucency = new KTranslucencyConfig(false, mConfig, this, "KWin Translucency");
- mTranslucency->tqlayout()->setMargin( KDialog::marginHint() );
+ mTranslucency->layout()->setMargin( KDialog::marginHint() );
tab->addTab(mTranslucency, i18n("&Translucency"));
connect(mTranslucency, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
@@ -206,17 +206,17 @@ KActionsOptions::KActionsOptions(TQWidget *parent, const char *name)
{
mConfig = new KConfig("kwinrc", false, true);
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+ TQVBoxLayout *layout = new TQVBoxLayout(this);
tab = new TQTabWidget(this);
- tqlayout->addWidget(tab);
+ layout->addWidget(tab);
mTitleBarActions = new KTitleBarActionsConfig(false, mConfig, this, "KWin TitleBar Actions");
- mTitleBarActions->tqlayout()->setMargin( KDialog::marginHint() );
+ mTitleBarActions->layout()->setMargin( KDialog::marginHint() );
tab->addTab(mTitleBarActions, i18n("&Titlebar Actions"));
connect(mTitleBarActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
mWindowActions = new KWindowActionsConfig(false, mConfig, this, "KWin Window Actions");
- mWindowActions->tqlayout()->setMargin( KDialog::marginHint() );
+ mWindowActions->layout()->setMargin( KDialog::marginHint() );
tab->addTab(mWindowActions, i18n("Window Actio&ns"));
connect(mWindowActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
}
diff --git a/kwin/kcmkwin/kwinoptions/mouse.cpp b/kwin/kcmkwin/kwinoptions/mouse.cpp
index 07acd64cf..6adba1f89 100644
--- a/kwin/kcmkwin/kwinoptions/mouse.cpp
+++ b/kwin/kcmkwin/kwinoptions/mouse.cpp
@@ -136,7 +136,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
: KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
{
TQString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3;
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+ TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
TQGrid *grid;
TQGroupBox *box;
TQLabel *label;
@@ -147,10 +147,10 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
/** Titlebar doubleclick ************/
- TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout);
+ TQHBoxLayout *hlayout = new TQHBoxLayout(layout);
label = new TQLabel(i18n("&Titlebar double-click:"), this);
- htqlayout->addWidget(label);
+ hlayout->addWidget(label);
TQWhatsThis::add( label, i18n("Here you can customize mouse click behavior when double clicking on the"
" titlebar of a window.") );
@@ -163,19 +163,19 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
combo->insertItem(i18n("Lower"));
combo->insertItem(i18n("On All Desktops"));
combo->insertItem(i18n("Nothing"));
- combo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
+ combo->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
- htqlayout->addWidget(combo);
+ hlayout->addWidget(combo);
coTiDbl = combo;
TQWhatsThis::add(combo, i18n("Behavior on <em>double</em> click into the titlebar."));
label->setBuddy(combo);
/** Mouse Wheel Events **************/
- TQHBoxLayout *htqlayoutW = new TQHBoxLayout(tqlayout);
+ TQHBoxLayout *hlayoutW = new TQHBoxLayout(layout);
strMouseWheel = i18n("Titlebar wheel event:");
label = new TQLabel(strMouseWheel, this);
- htqlayoutW->addWidget(label);
+ hlayoutW->addWidget(label);
txtButton4 = i18n("Handle mouse wheel events");
TQWhatsThis::add( label, txtButton4);
@@ -188,9 +188,9 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
comboW->insertItem(i18n("Move to Previous/Next Desktop"));
comboW->insertItem(i18n("Change Opacity"));
comboW->insertItem(i18n("Nothing"));
- comboW->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
+ comboW->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
connect(comboW, TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
- htqlayoutW->addWidget(comboW);
+ hlayoutW->addWidget(comboW);
coTiAct4 = comboW;
TQWhatsThis::add(comboW, txtButton4);
label->setBuddy(comboW);
@@ -198,9 +198,9 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
/** Titlebar and frame **************/
box = new TQVGroupBox( i18n("Titlebar && Frame"), this, "Titlebar and Frame");
- box->tqlayout()->setMargin(KDialog::marginHint());
- box->tqlayout()->setSpacing(KDialog::spacingHint());
- tqlayout->addWidget(box);
+ box->layout()->setMargin(KDialog::marginHint());
+ box->layout()->setSpacing(KDialog::spacingHint());
+ layout->addWidget(box);
TQWhatsThis::add( box, i18n("Here you can customize mouse click behavior when clicking on the"
" titlebar or the frame of a window.") );
@@ -219,8 +219,8 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
if ( leftHandedMouse )
{
- tqSwap(strMouseButton1, strMouseButton3);
- tqSwap(txtButton1, txtButton3);
+ qSwap(strMouseButton1, strMouseButton3);
+ qSwap(txtButton1, txtButton3);
}
label = new TQLabel(strMouseButton1, grid);
@@ -235,7 +235,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
label = new TQLabel(i18n("Active"), grid);
- label->tqsetAlignment(AlignCenter);
+ label->setAlignment(AlignCenter);
TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar"
" or the frame of an active window.") );
@@ -256,7 +256,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
"<em>active</em> window.");
// Be nice to left handed users
- if ( leftHandedMouse ) tqSwap(txtButton1, txtButton3);
+ if ( leftHandedMouse ) qSwap(txtButton1, txtButton3);
TQWhatsThis::add(combo, txtButton1);
@@ -289,10 +289,10 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
"<em>inactive</em> window.");
// Be nice to left handed users
- if ( leftHandedMouse ) tqSwap(txtButton1, txtButton3);
+ if ( leftHandedMouse ) qSwap(txtButton1, txtButton3);
label = new TQLabel(i18n("Inactive"), grid);
- label->tqsetAlignment(AlignCenter);
+ label->setAlignment(AlignCenter);
TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar"
" or the frame of an inactive window.") );
@@ -327,9 +327,9 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
/** Maximize Button ******************/
box = new TQHGroupBox(i18n("Maximize Button"), this, "Maximize Button");
- box->tqlayout()->setMargin(KDialog::marginHint());
- box->tqlayout()->setSpacing(KDialog::spacingHint());
- tqlayout->addWidget(box);
+ box->layout()->setMargin(KDialog::marginHint());
+ box->layout()->setSpacing(KDialog::spacingHint());
+ layout->addWidget(box);
TQWhatsThis::add( box,
i18n("Here you can customize behavior when clicking on the maximize button.") );
@@ -345,8 +345,8 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
if ( leftHandedMouse ) // Be nice to lefties
{
- tqSwap(strMouseButton[0], strMouseButton[2]);
- tqSwap(txtButton[0], txtButton[2]);
+ qSwap(strMouseButton[0], strMouseButton[2]);
+ qSwap(txtButton[0], txtButton[2]);
}
createMaxButtonPixmaps();
@@ -356,19 +356,19 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf
TQLabel * label = new TQLabel(strMouseButton[b], box);
TQWhatsThis::add( label, txtButton[b] );
- label ->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ));
+ label ->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ));
coMax[b] = new ToolTipComboBox(box, tbl_Max);
for (int t = 0; t < 3; ++t) coMax[b]->insertItem(maxButtonPixmaps[t]);
connect(coMax[b], TQT_SIGNAL(activated(int)), TQT_SLOT(changed()));
connect(coMax[b], TQT_SIGNAL(activated(int)), coMax[b], TQT_SLOT(changed()));
TQWhatsThis::add( coMax[b], txtButton[b] );
- coMax[b]->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ));
+ coMax[b]->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ));
}
connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
- tqlayout->addStretch();
+ layout->addStretch();
load();
}
@@ -588,7 +588,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
: KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone)
{
TQString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3, strAllW;
- TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+ TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
TQGrid *grid;
TQGroupBox *box;
TQLabel *label;
@@ -600,9 +600,9 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
/** Inactive inner window ******************/
box = new TQVGroupBox(i18n("Inactive Inner Window"), this, "Inactive Inner Window");
- box->tqlayout()->setMargin(KDialog::marginHint());
- box->tqlayout()->setSpacing(KDialog::spacingHint());
- tqlayout->addWidget(box);
+ box->layout()->setMargin(KDialog::marginHint());
+ box->layout()->setSpacing(KDialog::spacingHint());
+ layout->addWidget(box);
TQWhatsThis::add( box, i18n("Here you can customize mouse click behavior when clicking on an inactive"
" inner window ('inner' means: not titlebar, not frame).") );
@@ -618,8 +618,8 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
if ( leftHandedMouse )
{
- tqSwap(strMouseButton1, strMouseButton3);
- tqSwap(txtButton1, txtButton3);
+ qSwap(strMouseButton1, strMouseButton3);
+ qSwap(txtButton1, txtButton3);
}
strWin1 = i18n("In this row you can customize left click behavior when clicking into"
@@ -629,7 +629,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
" an inactive inner window ('inner' means: not titlebar, not frame).");
// Be nice to lefties
- if ( leftHandedMouse ) tqSwap(strWin1, strWin3);
+ if ( leftHandedMouse ) qSwap(strWin1, strWin3);
label = new TQLabel(strMouseButton1, grid);
TQWhatsThis::add( label, strWin1 );
@@ -670,9 +670,9 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
/** Inner window, titlebar and frame **************/
box = new TQVGroupBox(i18n("Inner Window, Titlebar && Frame"), this, "Inner Window, Titlebar and Frame");
- box->tqlayout()->setMargin(KDialog::marginHint());
- box->tqlayout()->setSpacing(KDialog::spacingHint());
- tqlayout->addWidget(box);
+ box->layout()->setMargin(KDialog::marginHint());
+ box->layout()->setSpacing(KDialog::spacingHint());
+ layout->addWidget(box);
TQWhatsThis::add( box, i18n("Here you can customize KDE's behavior when clicking somewhere into"
" a window while pressing a modifier key."));
@@ -696,8 +696,8 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
if ( leftHandedMouse )
{
- tqSwap(strMouseButton1, strMouseButton3);
- tqSwap(strAll1, strAll3);
+ qSwap(strMouseButton1, strMouseButton3);
+ qSwap(strAll1, strAll3);
}
label = new TQLabel(strMouseButton1, grid);
@@ -764,7 +764,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config,
coAllW = combo;
TQWhatsThis::add( combo, strAllW );
- tqlayout->addStretch();
+ layout->addStretch();
load();
}
diff --git a/kwin/kcmkwin/kwinoptions/windows.cpp b/kwin/kcmkwin/kwinoptions/windows.cpp
index d7c3893c6..cc8643af9 100644
--- a/kwin/kcmkwin/kwinoptions/windows.cpp
+++ b/kwin/kcmkwin/kwinoptions/windows.cpp
@@ -110,7 +110,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren
//iTLabel = new TQLabel(i18n(" Allowed overlap:\n"
// "(% of desktop space)"),
// plcBox);
- //iTLabel->tqsetAlignment(AlignTop|AlignHCenter);
+ //iTLabel->setAlignment(AlignTop|AlignHCenter);
//pLay->addWidget(iTLabel,1,1);
//interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox);
@@ -124,7 +124,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren
fcsBox = new TQButtonGroup(i18n("Focus"),this);
fcsBox->setColumnLayout( 0, Qt::Horizontal );
- TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->tqlayout(),
+ TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->layout(),
KDialog::spacingHint());
TQBoxLayout *cLay = new TQHBoxLayout(fLay);
@@ -192,8 +192,8 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren
connect(clickRaiseOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(clickRaiseOnTog(bool)));
fLay->addWidget(clickRaiseOn);
-// fLay->addColSpacing(0,QMAX(autoRaiseOn->tqsizeHint().width(),
-// clickRaiseOn->tqsizeHint().width()) + 15);
+// fLay->addColSpacing(0,QMAX(autoRaiseOn->sizeHint().width(),
+// clickRaiseOn->sizeHint().width()) + 15);
TQWhatsThis::add( autoRaiseOn, i18n("When this option is enabled, a window in the background will automatically"
" come to the front when the mouse pointer has been over it for some time.") );
@@ -236,7 +236,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren
kbdBox = new TQButtonGroup(i18n("Navigation"), this);
kbdBox->setColumnLayout( 0, Qt::Horizontal );
- TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->tqlayout(), KDialog::spacingHint());
+ TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->layout(), KDialog::spacingHint());
altTabPopup = new TQCheckBox( i18n("Show window list while switching windows"), kbdBox );
kLay->addWidget( altTabPopup );
@@ -573,7 +573,7 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, TQWidget *
//iTLabel = new TQLabel(i18n(" Allowed overlap:\n"
// "(% of desktop space)"),
// plcBox);
- //iTLabel->tqsetAlignment(AlignTop|AlignHCenter);
+ //iTLabel->setAlignment(AlignTop|AlignHCenter);
//pLay->addWidget(iTLabel,1,1);
//interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox);
@@ -831,7 +831,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare
windowsBox = new TQButtonGroup(i18n("Windows"), this);
windowsBox->setColumnLayout( 0, Qt::Horizontal );
- TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->tqlayout(), KDialog::spacingHint());
+ TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->layout(), KDialog::spacingHint());
TQBoxLayout *bLay = new TQVBoxLayout;
wLay->addLayout(bLay);
@@ -848,9 +848,9 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare
" while resizing it, instead of just showing a window 'skeleton'. The result may not be satisfying"
" on slow machines.") );
- tqgeometryTipOn = new TQCheckBox(i18n("Display window &tqgeometry when moving or resizing"), windowsBox);
- bLay->addWidget(tqgeometryTipOn);
- TQWhatsThis::add(tqgeometryTipOn, i18n("Enable this option if you want a window's tqgeometry to be displayed"
+ geometryTipOn = new TQCheckBox(i18n("Display window &geometry when moving or resizing"), windowsBox);
+ bLay->addWidget(geometryTipOn);
+ TQWhatsThis::add(geometryTipOn, i18n("Enable this option if you want a window's geometry to be displayed"
" while it is being moved or resized. The window position relative"
" to the top-left corner of the screen is displayed together with"
" its size."));
@@ -877,11 +877,11 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare
connect(minimizeAnimSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setMinimizeAnimSpeed(int)));
minimizeAnimSlowLabel= new TQLabel(i18n("Slow"),windowsBox);
- minimizeAnimSlowLabel->tqsetAlignment(Qt::AlignTop|Qt::AlignLeft);
+ minimizeAnimSlowLabel->setAlignment(Qt::AlignTop|Qt::AlignLeft);
rLay->addWidget(minimizeAnimSlowLabel,1,1);
minimizeAnimFastLabel= new TQLabel(i18n("Fast"),windowsBox);
- minimizeAnimFastLabel->tqsetAlignment(Qt::AlignTop|Qt::AlignRight);
+ minimizeAnimFastLabel->setAlignment(Qt::AlignTop|Qt::AlignRight);
rLay->addWidget(minimizeAnimFastLabel,1,2);
wtstr = i18n("Here you can set the speed of the animation shown when windows are"
@@ -940,7 +940,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare
//iTLabel = new TQLabel(i18n(" Allowed overlap:\n"
// "(% of desktop space)"),
// plcBox);
- //iTLabel->tqsetAlignment(AlignTop|AlignHCenter);
+ //iTLabel->setAlignment(AlignTop|AlignHCenter);
//pLay->addWidget(iTLabel,1,1);
//interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox);
@@ -986,7 +986,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare
// Any changes goes to slotChanged()
connect( opaque, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
connect( resizeOpaqueOn, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
- connect( tqgeometryTipOn, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
+ connect( geometryTipOn, TQT_SIGNAL(clicked()), TQT_SLOT(changed()));
connect( minimizeAnimOn, TQT_SIGNAL(clicked() ), TQT_SLOT(changed()));
connect( minimizeAnimSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed()));
connect( moveResizeMaximized, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()));
@@ -1014,12 +1014,12 @@ void KMovingConfig::setMove(int trans)
void KMovingConfig::setGeometryTip(bool showGeometryTip)
{
- tqgeometryTipOn->setChecked(showGeometryTip);
+ geometryTipOn->setChecked(showGeometryTip);
}
bool KMovingConfig::getGeometryTip()
{
- return tqgeometryTipOn->isChecked();
+ return geometryTipOn->isChecked();
}
// placement policy --- CT 31jan98 ---
diff --git a/kwin/kcmkwin/kwinoptions/windows.h b/kwin/kcmkwin/kwinoptions/windows.h
index 380a34809..83dc70b66 100644
--- a/kwin/kcmkwin/kwinoptions/windows.h
+++ b/kwin/kcmkwin/kwinoptions/windows.h
@@ -164,7 +164,7 @@ private:
TQButtonGroup *windowsBox;
TQCheckBox *opaque;
TQCheckBox *resizeOpaqueOn;
- TQCheckBox *tqgeometryTipOn;
+ TQCheckBox *geometryTipOn;
TQCheckBox* minimizeAnimOn;
TQSlider *minimizeAnimSlider;
TQLabel *minimizeAnimSlowLabel, *minimizeAnimFastLabel;
diff --git a/kwin/kcmkwin/kwinrules/detectwidget.cpp b/kwin/kcmkwin/kwinrules/detectwidget.cpp
index 918951b35..1a497c8bc 100644
--- a/kwin/kcmkwin/kwinrules/detectwidget.cpp
+++ b/kwin/kcmkwin/kwinrules/detectwidget.cpp
@@ -189,7 +189,7 @@ WId DetectDialog::findWindow()
{
Window root;
Window child;
- uint tqmask;
+ uint mask;
int rootX, rootY, x, y;
Window parent = qt_xrootwin();
Atom wm_state = XInternAtom( qt_xdisplay(), "WM_STATE", False );
@@ -198,7 +198,7 @@ WId DetectDialog::findWindow()
++i )
{
XQueryPointer( qt_xdisplay(), parent, &root, &child,
- &rootX, &rootY, &x, &y, &tqmask );
+ &rootX, &rootY, &x, &y, &mask );
if( child == None )
return 0;
Atom type;
diff --git a/kwin/kcmkwin/kwinrules/detectwidgetbase.ui b/kwin/kcmkwin/kwinrules/detectwidgetbase.ui
index 789594e97..31cae3ef3 100644
--- a/kwin/kcmkwin/kwinrules/detectwidgetbase.ui
+++ b/kwin/kcmkwin/kwinrules/detectwidgetbase.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>Form3</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -213,6 +213,6 @@
</widget>
</grid>
</widget>
-<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/kwin/kcmkwin/kwinrules/editshortcutbase.ui b/kwin/kcmkwin/kwinrules/editshortcutbase.ui
index c3a0d7ec6..3813ae589 100644
--- a/kwin/kcmkwin/kwinrules/editshortcutbase.ui
+++ b/kwin/kcmkwin/kwinrules/editshortcutbase.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>EditShortcutBase</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -50,7 +50,7 @@ For example "&lt;b&gt;Shift+Alt+(123) Shift+Ctrl+(ABC)&lt;/b&gt;" will first try
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<hbox>
<property name="name">
@@ -66,7 +66,7 @@ For example "&lt;b&gt;Shift+Alt+(123) Shift+Ctrl+(ABC)&lt;/b&gt;" will first try
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -91,7 +91,7 @@ For example "&lt;b&gt;Shift+Alt+(123) Shift+Ctrl+(ABC)&lt;/b&gt;" will first try
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -116,7 +116,7 @@ For example "&lt;b&gt;Shift+Alt+(123) Shift+Ctrl+(ABC)&lt;/b&gt;" will first try
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -159,6 +159,6 @@ For example "&lt;b&gt;Shift+Alt+(123) Shift+Ctrl+(ABC)&lt;/b&gt;" will first try
<slot access="protected" specifier="pure virtual">editShortcut()</slot>
<slot access="protected" specifier="pure virtual">clearShortcut()</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"/>
</UI>
diff --git a/kwin/kcmkwin/kwinrules/kcm.cpp b/kwin/kcmkwin/kwinrules/kcm.cpp
index 90c7a0cb8..19b714311 100644
--- a/kwin/kcmkwin/kwinrules/kcm.cpp
+++ b/kwin/kcmkwin/kwinrules/kcm.cpp
@@ -42,9 +42,9 @@ KCMRules::KCMRules( TQWidget *parent, const char *name )
: KCModule( parent, name )
, config( "kwinrulesrc" )
{
- TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+ TQVBoxLayout *layout = new TQVBoxLayout( this );
widget = new KCMRulesList( this );
- tqlayout->addWidget( widget );
+ layout->addWidget( widget );
connect( widget, TQT_SIGNAL( changed( bool )), TQT_SLOT( moduleChanged( bool )));
KAboutData *about = new KAboutData(I18N_NOOP( "kcmkwinrules" ),
I18N_NOOP( "Window-Specific Settings Configuration Module" ),
diff --git a/kwin/kcmkwin/kwinrules/kwinrules.desktop b/kwin/kcmkwin/kwinrules/kwinrules.desktop
index 3bd0e0c67..245994a8a 100644
--- a/kwin/kcmkwin/kwinrules/kwinrules.desktop
+++ b/kwin/kcmkwin/kwinrules/kwinrules.desktop
@@ -154,7 +154,7 @@ Keywords[cs]=velikost,pozice,umístění,stav,chování oken,pravidla
Keywords[csb]=miara,pòłożenié,stón,ùchòwanié òknół,òkna,spamiãtanié nastôwów,zapamiãtanié nastôwów,regle
Keywords[cy]=maint,lleoliad,cyflwr,ffenestr,ymddygiad,ffenestri,penodol,ffyrdd osgoi,cofio,rheolau
Keywords[da]=størrelse,position,tilstand,vinduesopførsel,vinduer,specifik, omgåelse,husk,regler
-Keywords[de]=Größe,Position,tqStatus,Fensterverhalten,Fenster,Regeln
+Keywords[de]=Größe,Position,Status,Fensterverhalten,Fenster,Regeln
Keywords[el]=μέγεθος,θέση,κατάσταση,συμπεριφορά παραθύρου,παράθυρα,ειδικές,λύσεις,αποθήκευση,κανόνων
Keywords[en_GB]=size,position,state,window behaviour,windows,specific,workarounds,remember,rules
Keywords[eo]=grandeco,pozicio,stato,fenestra konduto,fenestroj,reguloj
@@ -180,7 +180,7 @@ Keywords[lv]=izmērs,novietojums,statuss,loga izturēšanās,logi,specifisks,apj
Keywords[mk]=size,position,state,window behavior,windows,specific,workarounds,remember,rules,големина,позиција,состојба,однесување на прозорец,специфично,заобиколни
Keywords[mt]=size,position,state,window behavior,windows,specific,workarounds,remember,rules,daqs
Keywords[nb]=størrelse,posisjon,status,vindusoppførsel,vinduer,spesifikk,jukseløsninger,husk,regler
-Keywords[nds]=Grött,Positschoon,tqStatus,Finsterbedregen,Finstern,enkel,enkelte,Regeln,behollen,workaround
+Keywords[nds]=Grött,Positschoon,Status,Finsterbedregen,Finstern,enkel,enkelte,Regeln,behollen,workaround
Keywords[ne]=साइज, स्थिति, अवस्था, सञ्झ्याल व्यवहार, सञ्झ्यालहरू, निर्दिष्ट, कार्यक्षेत्र, याद गर्नुहोस्, नियम
Keywords[nl]=grootte,positie,venstergedrag,vensters,specifiek,alternatieven,onthouden,regels
Keywords[nn]=storleik,plassering,tilstand,vindaugsåtferd,vindauge,spesifikk,jukseløysingar,hugs,reglar
diff --git a/kwin/kcmkwin/kwinrules/main.cpp b/kwin/kcmkwin/kwinrules/main.cpp
index af25412f8..b58c96239 100644
--- a/kwin/kcmkwin/kwinrules/main.cpp
+++ b/kwin/kcmkwin/kwinrules/main.cpp
@@ -179,7 +179,7 @@ static Rules* findRule( const TQValueList< Rules* >& rules, Window wid, bool who
if( type == NET::Unknown )
ret->types = NET::NormalMask;
else
- ret->types = 1 << type; // convert type to its tqmask
+ ret->types = 1 << type; // convert type to its mask
ret->title = title; // set, but make unimportant
ret->titlematch = Rules::UnimportantMatch;
ret->clientmachine = machine; // set, but make unimportant
diff --git a/kwin/kcmkwin/kwinrules/ruleslistbase.ui b/kwin/kcmkwin/kwinrules/ruleslistbase.ui
index b36a1987f..c2abdaa9d 100644
--- a/kwin/kcmkwin/kwinrules/ruleslistbase.ui
+++ b/kwin/kcmkwin/kwinrules/ruleslistbase.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>
@@ -77,7 +77,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>294</height>
@@ -86,6 +86,6 @@
</spacer>
</grid>
</widget>
-<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/kwin/kcmkwin/kwinrules/ruleswidget.cpp b/kwin/kcmkwin/kwinrules/ruleswidget.cpp
index ea426e7f1..2525644d9 100644
--- a/kwin/kcmkwin/kwinrules/ruleswidget.cpp
+++ b/kwin/kcmkwin/kwinrules/ruleswidget.cpp
@@ -78,7 +78,7 @@ RulesWidget::RulesWidget( TQWidget* parent, const char* name )
" until it is hidden (this action will be deleted after the window is hidden).</li>"
"</ul>" );
// window tabs have enable signals done in designer
- // tqgeometry tab
+ // geometry tab
SETUP( position, set );
SETUP( size, set );
SETUP( desktop, set );
@@ -106,7 +106,7 @@ RulesWidget::RulesWidget( TQWidget* parent, const char* name )
SETUP( ignoreposition, force );
SETUP( minsize, force );
SETUP( maxsize, force );
- SETUP( stricttqgeometry, force );
+ SETUP( strictgeometry, force );
SETUP( disableglobalshortcuts, force );
KWinModule module;
int i;
@@ -126,7 +126,7 @@ void RulesWidget::updateEnable##var() \
var->setEnabled( enable_##var->isChecked() && rule_##var->currentItem() != 0 ); \
}
-// tqgeometry tab
+// geometry tab
UPDATE_ENABLE_SLOT( position )
UPDATE_ENABLE_SLOT( size )
UPDATE_ENABLE_SLOT( desktop )
@@ -158,7 +158,7 @@ UPDATE_ENABLE_SLOT( type )
UPDATE_ENABLE_SLOT( ignoreposition )
UPDATE_ENABLE_SLOT( minsize )
UPDATE_ENABLE_SLOT( maxsize )
-UPDATE_ENABLE_SLOT( stricttqgeometry )
+UPDATE_ENABLE_SLOT( strictgeometry )
UPDATE_ENABLE_SLOT( disableglobalshortcuts )
#undef UPDATE_ENABLE_SLOT
@@ -428,7 +428,7 @@ void RulesWidget::setRules( Rules* rules )
CHECKBOX_FORCE_RULE( ignoreposition, );
LINEEDIT_FORCE_RULE( minsize, sizeToStr );
LINEEDIT_FORCE_RULE( maxsize, sizeToStr );
- CHECKBOX_FORCE_RULE( stricttqgeometry, );
+ CHECKBOX_FORCE_RULE( strictgeometry, );
CHECKBOX_FORCE_RULE( disableglobalshortcuts, );
}
@@ -518,7 +518,7 @@ Rules* RulesWidget::rules() const
CHECKBOX_FORCE_RULE( ignoreposition, );
LINEEDIT_FORCE_RULE( minsize, strToSize );
LINEEDIT_FORCE_RULE( maxsize, strToSize );
- CHECKBOX_FORCE_RULE( stricttqgeometry, );
+ CHECKBOX_FORCE_RULE( strictgeometry, );
CHECKBOX_FORCE_RULE( disableglobalshortcuts, );
return rules;
}
@@ -621,7 +621,7 @@ void RulesWidget::prefillUnusedValues( const KWin::WindowInfo& info )
CHECKBOX_PREFILL( above,, info.state() & NET::KeepAbove );
CHECKBOX_PREFILL( below,, info.state() & NET::KeepBelow );
// noborder is only internal KWin information, so let's guess
- CHECKBOX_PREFILL( noborder,, info.frameGeometry() == info.tqgeometry() );
+ CHECKBOX_PREFILL( noborder,, info.frameGeometry() == info.geometry() );
CHECKBOX_PREFILL( skiptaskbar,, info.state() & NET::SkipTaskbar );
CHECKBOX_PREFILL( skippager,, info.state() & NET::SkipPager );
//CHECKBOX_PREFILL( acceptfocus, );
@@ -635,7 +635,7 @@ void RulesWidget::prefillUnusedValues( const KWin::WindowInfo& info )
//CHECKBOX_PREFILL( ignoreposition, );
LINEEDIT_PREFILL( minsize, sizeToStr, info.frameGeometry().size() );
LINEEDIT_PREFILL( maxsize, sizeToStr, info.frameGeometry().size() );
- //CHECKBOX_PREFILL( stricttqgeometry, );
+ //CHECKBOX_PREFILL( strictgeometry, );
//CHECKBOX_PREFILL( disableglobalshortcuts, );
}
@@ -661,7 +661,7 @@ bool RulesWidget::finalCheck()
all_types = false;
if( wmclass_match->currentItem() == Rules::UnimportantMatch && all_types )
{
- if( KMessageBox::warningContinueCancel( tqtopLevelWidget(),
+ if( KMessageBox::warningContinueCancel( topLevelWidget(),
i18n( "You have specified the window class as unimportant.\n"
"This means the settings will possibly apply to windows from all applications. "
"If you really want to create a generic setting, it is recommended you at least "
@@ -673,14 +673,14 @@ bool RulesWidget::finalCheck()
void RulesWidget::prepareWindowSpecific( WId window )
{
- tabs->setCurrentPage( 2 ); // tqgeometry tab, skip tabs for window identification
+ tabs->setCurrentPage( 2 ); // geometry tab, skip tabs for window identification
KWin::WindowInfo info( window, -1U, -1U ); // read everything
prefillUnusedValues( info );
}
void RulesWidget::shortcutEditClicked()
{
- EditShortcutDialog dlg( tqtopLevelWidget());
+ EditShortcutDialog dlg( topLevelWidget());
dlg.setShortcut( shortcut->text());
if( dlg.exec() == TQDialog::Accepted )
shortcut->setText( dlg.shortcut());
@@ -735,7 +735,7 @@ EditShortcut::EditShortcut( TQWidget* parent, const char* name )
void EditShortcut::editShortcut()
{
- ShortcutDialog dlg( KShortcut( shortcut->text()), tqtopLevelWidget());
+ ShortcutDialog dlg( KShortcut( shortcut->text()), topLevelWidget());
if( dlg.exec() == TQDialog::Accepted )
shortcut->setText( dlg.shortcut().toString());
}
diff --git a/kwin/kcmkwin/kwinrules/ruleswidget.h b/kwin/kcmkwin/kwinrules/ruleswidget.h
index ec38818ff..b47ad88ab 100644
--- a/kwin/kcmkwin/kwinrules/ruleswidget.h
+++ b/kwin/kcmkwin/kwinrules/ruleswidget.h
@@ -54,7 +54,7 @@ class RulesWidget
virtual void machineMatchChanged();
virtual void shortcutEditClicked();
private slots:
- // tqgeometry tab
+ // geometry tab
void updateEnableposition();
void updateEnablesize();
void updateEnabledesktop();
@@ -81,7 +81,7 @@ class RulesWidget
void updateEnableignoreposition();
void updateEnableminsize();
void updateEnablemaxsize();
- void updateEnablestricttqgeometry();
+ void updateEnablestrictgeometry();
void updateEnableshortcut();
void updateEnabledisableglobalshortcuts();
// internal
diff --git a/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui b/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui
index 0b23f2ed2..01c1b9918 100644
--- a/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui
+++ b/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>Form2</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -87,7 +87,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -129,7 +129,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>212</width>
<height>20</height>
@@ -157,7 +157,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>211</width>
<height>20</height>
@@ -199,7 +199,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>212</width>
<height>20</height>
@@ -230,7 +230,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>211</width>
<height>20</height>
@@ -271,7 +271,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>270</width>
<height>20</height>
@@ -296,7 +296,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>269</width>
<height>20</height>
@@ -470,7 +470,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>199</width>
<height>20</height>
@@ -501,7 +501,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>199</width>
<height>20</height>
@@ -543,7 +543,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>199</width>
<height>20</height>
@@ -574,7 +574,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>199</width>
<height>20</height>
@@ -616,7 +616,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>199</width>
<height>20</height>
@@ -647,7 +647,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>199</width>
<height>20</height>
@@ -1181,7 +1181,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -1347,7 +1347,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>171</width>
<height>20</height>
@@ -1364,7 +1364,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>290</width>
<height>20</height>
@@ -1381,7 +1381,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>290</width>
<height>20</height>
@@ -1398,7 +1398,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>290</width>
<height>20</height>
@@ -1415,7 +1415,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>290</width>
<height>20</height>
@@ -1432,7 +1432,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>290</width>
<height>20</height>
@@ -1449,7 +1449,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>290</width>
<height>20</height>
@@ -1466,7 +1466,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>290</width>
<height>20</height>
@@ -1796,7 +1796,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>80</height>
@@ -1847,7 +1847,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>181</width>
<height>20</height>
@@ -2231,7 +2231,7 @@
<cstring>enable_ignoreposition</cstring>
</property>
<property name="text">
- <string>Ignore requested &amp;tqgeometry</string>
+ <string>Ignore requested &amp;geometry</string>
</property>
</widget>
<widget class="KComboBox" row="3" column="1">
@@ -2278,7 +2278,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>160</height>
@@ -2287,10 +2287,10 @@
</spacer>
<widget class="QCheckBox" row="6" column="0">
<property name="name">
- <cstring>enable_stricttqgeometry</cstring>
+ <cstring>enable_strictgeometry</cstring>
</property>
<property name="text">
- <string>Strictly obey tqgeometry</string>
+ <string>Strictly obey geometry</string>
</property>
<property name="accel">
<string></string>
@@ -2313,7 +2313,7 @@
</property>
</item>
<property name="name">
- <cstring>rule_stricttqgeometry</cstring>
+ <cstring>rule_strictgeometry</cstring>
</property>
<property name="enabled">
<bool>false</bool>
@@ -2321,7 +2321,7 @@
</widget>
<widget class="QCheckBox" row="6" column="3">
<property name="name">
- <cstring>stricttqgeometry</cstring>
+ <cstring>strictgeometry</cstring>
</property>
<property name="enabled">
<bool>false</bool>
@@ -2523,9 +2523,9 @@
<tabstop>enable_maxsize</tabstop>
<tabstop>rule_maxsize</tabstop>
<tabstop>maxsize</tabstop>
- <tabstop>enable_stricttqgeometry</tabstop>
- <tabstop>rule_stricttqgeometry</tabstop>
- <tabstop>stricttqgeometry</tabstop>
+ <tabstop>enable_strictgeometry</tabstop>
+ <tabstop>rule_strictgeometry</tabstop>
+ <tabstop>strictgeometry</tabstop>
<tabstop>enable_disableglobalshortcuts</tabstop>
<tabstop>rule_disableglobalshortcuts</tabstop>
<tabstop>disableglobalshortcuts</tabstop>
@@ -2539,8 +2539,8 @@
<slot access="protected" specifier="pure virtual">machineMatchChanged()</slot>
<slot access="protected" specifier="pure virtual">shortcutEditClicked()</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>kcombobox.h</includehint>
<includehint>kpushbutton.h</includehint>