diff options
Diffstat (limited to 'kwin/kcmkwin')
21 files changed, 944 insertions, 944 deletions
diff --git a/kwin/kcmkwin/kwindecoration/buttons.cpp b/kwin/kcmkwin/kwindecoration/buttons.cpp index 888e092e7..5d1d96d85 100644 --- a/kwin/kcmkwin/kwindecoration/buttons.cpp +++ b/kwin/kcmkwin/kwindecoration/buttons.cpp @@ -28,11 +28,11 @@ */ -#include <qheader.h> -#include <qpainter.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qstyle.h> +#include <tqheader.h> +#include <tqpainter.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqstyle.h> #include <kdebug.h> @@ -47,11 +47,11 @@ #define BUTTONDRAGMIMETYPE "application/x-kde_kwindecoration_buttons" -ButtonDrag::ButtonDrag( Button btn, QWidget* parent, const char* name) - : QStoredDrag( BUTTONDRAGMIMETYPE, parent, name) +ButtonDrag::ButtonDrag( Button btn, TQWidget* parent, const char* name) + : TQStoredDrag( BUTTONDRAGMIMETYPE, parent, name) { - QByteArray data; - QDataStream stream(data, IO_WriteOnly); + TQByteArray data; + TQDataStream stream(data, IO_WriteOnly); stream << btn.name; stream << btn.icon; stream << btn.type.unicode(); @@ -61,23 +61,23 @@ ButtonDrag::ButtonDrag( Button btn, QWidget* parent, const char* name) } -bool ButtonDrag::canDecode( QDropEvent* e ) +bool ButtonDrag::canDecode( TQDropEvent* e ) { return e->provides( BUTTONDRAGMIMETYPE ); } -bool ButtonDrag::decode( QDropEvent* e, Button& btn ) +bool ButtonDrag::decode( TQDropEvent* e, Button& btn ) { - QByteArray data = e->data( BUTTONDRAGMIMETYPE ); + TQByteArray data = e->data( BUTTONDRAGMIMETYPE ); if ( data.size() ) { e->accept(); - QDataStream stream(data, IO_ReadOnly); + TQDataStream stream(data, IO_ReadOnly); stream >> btn.name; stream >> btn.icon; ushort type; stream >> type; - btn.type = QChar(type); + btn.type = TQChar(type); int duplicate; stream >> duplicate; btn.duplicate = duplicate; @@ -94,7 +94,7 @@ Button::Button() { } -Button::Button(const QString& n, const QBitmap& i, QChar t, bool d, bool s) +Button::Button(const TQString& n, const TQBitmap& i, TQChar t, bool d, bool s) : name(n), icon(i), type(t), @@ -108,11 +108,11 @@ Button::~Button() } // helper function to deal with the Button's bitmaps more easily... -QPixmap bitmapPixmap(const QBitmap& bm, const QColor& color) +TQPixmap bitmapPixmap(const TQBitmap& bm, const TQColor& color) { - QPixmap pm(bm.size() ); + TQPixmap pm(bm.size() ); pm.setMask(bm); - QPainter p(&pm); + TQPainter p(&pm); p.setPen(color); p.drawPixmap(0,0,bm); p.end(); @@ -120,12 +120,12 @@ QPixmap bitmapPixmap(const QBitmap& bm, const QColor& color) } -ButtonSource::ButtonSource(QWidget *parent, const char* name) +ButtonSource::ButtonSource(TQWidget *parent, const char* name) : KListView(parent, name) { - setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); + setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); - setResizeMode(QListView::AllColumns); + setResizeMode(TQListView::AllColumns); setDragEnabled(true); setAcceptDrops(true); setDropVisualizer(false); @@ -140,20 +140,20 @@ ButtonSource::~ButtonSource() { } -QSize ButtonSource::sizeHint() const +TQSize ButtonSource::sizeHint() const { - // make the sizeHint height a bit smaller than the one of QListView... + // make the sizeHint height a bit smaller than the one of TQListView... if ( cachedSizeHint().isValid() ) return cachedSizeHint(); constPolish(); - QSize s( header()->sizeHint() ); + TQSize s( header()->sizeHint() ); if ( verticalScrollBar()->isVisible() ) - s.setWidth( s.width() + style().pixelMetric(QStyle::PM_ScrollBarExtent) ); - s += QSize(frameWidth()*2,frameWidth()*2); + s.setWidth( s.width() + style().pixelMetric(TQStyle::PM_ScrollBarExtent) ); + s += TQSize(frameWidth()*2,frameWidth()*2); // size hint: 4 lines of text... s.setHeight( s.height() + fontMetrics().lineSpacing()*3 ); @@ -165,7 +165,7 @@ QSize ButtonSource::sizeHint() const void ButtonSource::hideAllButtons() { - QListViewItemIterator it(this); + TQListViewItemIterator it(this); while (it.current() ) { it.current()->setVisible(false); ++it; @@ -174,16 +174,16 @@ void ButtonSource::hideAllButtons() void ButtonSource::showAllButtons() { - QListViewItemIterator it(this); + TQListViewItemIterator it(this); while (it.current() ) { it.current()->setVisible(true); ++it; } } -void ButtonSource::showButton( QChar btn ) +void ButtonSource::showButton( TQChar btn ) { - QListViewItemIterator it(this); + TQListViewItemIterator it(this); while (it.current() ) { ButtonSourceItem *item = dynamic_cast<ButtonSourceItem*>(it.current() ); if (item && item->button().type == btn) { @@ -194,9 +194,9 @@ void ButtonSource::showButton( QChar btn ) } } -void ButtonSource::hideButton( QChar btn ) +void ButtonSource::hideButton( TQChar btn ) { - QListViewItemIterator it(this); + TQListViewItemIterator it(this); while (it.current() ) { ButtonSourceItem *item = dynamic_cast<ButtonSourceItem*>(it.current() ); if (item && item->button().type == btn && !item->button().duplicate) { @@ -207,12 +207,12 @@ void ButtonSource::hideButton( QChar btn ) } } -bool ButtonSource::acceptDrag(QDropEvent* e) const +bool ButtonSource::acceptDrag(TQDropEvent* e) const { return acceptDrops() && ButtonDrag::canDecode(e); } -QDragObject *ButtonSource::dragObject() +TQDragObject *ButtonSource::dragObject() { ButtonSourceItem *i = dynamic_cast<ButtonSourceItem*>(selectedItem() ); @@ -251,20 +251,20 @@ int ButtonDropSiteItem::height() return 20; } -void ButtonDropSiteItem::draw(QPainter *p, const QColorGroup& cg, QRect r) +void ButtonDropSiteItem::draw(TQPainter *p, const TQColorGroup& cg, TQRect r) { // p->fillRect(r, cg.base() ); if (m_button.supported) p->setPen(cg.foreground() ); else p->setPen(cg.mid() ); - QBitmap &i = m_button.icon; + TQBitmap &i = m_button.icon; p->drawPixmap(r.left()+(r.width()-i.width())/2, r.top()+(r.height()-i.height())/2, i); } -ButtonDropSite::ButtonDropSite( QWidget* parent, const char* name ) - : QFrame( parent, name ), +ButtonDropSite::ButtonDropSite( TQWidget* parent, const char* name ) + : TQFrame( parent, name ), m_selected(0) { setAcceptDrops( TRUE ); @@ -303,14 +303,14 @@ void ButtonDropSite::clearRight() } } -void ButtonDropSite::dragMoveEvent( QDragMoveEvent* e ) +void ButtonDropSite::dragMoveEvent( TQDragMoveEvent* e ) { - QPoint p = e->pos(); + TQPoint p = e->pos(); if (leftDropArea().contains(p) || rightDropArea().contains(p) || buttonAt(p) ) { e->accept(); // 2 pixel wide drop visualizer... - QRect r = contentsRect(); + TQRect r = contentsRect(); int x = -1; if (leftDropArea().contains(p) ) { x = leftDropArea().left(); @@ -327,7 +327,7 @@ void ButtonDropSite::dragMoveEvent( QDragMoveEvent* e ) } } if (x != -1) { - QRect tmpRect(x, r.y(), 2, r.height() ); + TQRect tmpRect(x, r.y(), 2, r.height() ); if (tmpRect != m_oldDropVisualizer) { cleanDropVisualizer(); m_oldDropVisualizer = tmpRect; @@ -346,28 +346,28 @@ void ButtonDropSite::cleanDropVisualizer() { if (m_oldDropVisualizer.isValid()) { - QRect rect = m_oldDropVisualizer; - m_oldDropVisualizer = QRect(); // rect is invalid + TQRect rect = m_oldDropVisualizer; + m_oldDropVisualizer = TQRect(); // rect is invalid update(rect); } } -void ButtonDropSite::dragEnterEvent( QDragEnterEvent* e ) +void ButtonDropSite::dragEnterEvent( TQDragEnterEvent* e ) { if ( ButtonDrag::canDecode( e ) ) e->accept(); } -void ButtonDropSite::dragLeaveEvent( QDragLeaveEvent* /* e */ ) +void ButtonDropSite::dragLeaveEvent( TQDragLeaveEvent* /* e */ ) { cleanDropVisualizer(); } -void ButtonDropSite::dropEvent( QDropEvent* e ) +void ButtonDropSite::dropEvent( TQDropEvent* e ) { cleanDropVisualizer(); - QPoint p = e->pos(); + TQPoint p = e->pos(); // collect information where to insert the dropped button ButtonList *buttonList = 0; @@ -393,7 +393,7 @@ void ButtonDropSite::dropEvent( QDropEvent* e ) // got the list and the aboveItem position. now determine if the item should be inserted // before aboveItem or after aboveItem. - QRect aboveItemRect = aboveItem->rect; + TQRect aboveItemRect = aboveItem->rect; if (!aboveItemRect.isValid() ) return; @@ -463,25 +463,25 @@ bool ButtonDropSite::getItemIterator(ButtonDropSiteItem *item, ButtonList* &list return true; } -QRect ButtonDropSite::leftDropArea() +TQRect ButtonDropSite::leftDropArea() { // return a 10 pixel drop area... - QRect r = contentsRect(); + TQRect r = contentsRect(); int leftButtonsWidth = calcButtonListWidth(buttonsLeft); - return QRect(r.left()+leftButtonsWidth, r.top(), 10, r.height() ); + return TQRect(r.left()+leftButtonsWidth, r.top(), 10, r.height() ); } -QRect ButtonDropSite::rightDropArea() +TQRect ButtonDropSite::rightDropArea() { // return a 10 pixel drop area... - QRect r = contentsRect(); + TQRect r = contentsRect(); int rightButtonsWidth = calcButtonListWidth(buttonsRight); - return QRect(r.right()-rightButtonsWidth-10, r.top(), 10, r.height() ); + return TQRect(r.right()-rightButtonsWidth-10, r.top(), 10, r.height() ); } -void ButtonDropSite::mousePressEvent( QMouseEvent* e ) +void ButtonDropSite::mousePressEvent( TQMouseEvent* e ) { // TODO: only start the real drag after some drag distance m_selected = buttonAt(e->pos() ); @@ -492,20 +492,20 @@ void ButtonDropSite::mousePressEvent( QMouseEvent* e ) } } -void ButtonDropSite::resizeEvent(QResizeEvent*) +void ButtonDropSite::resizeEvent(TQResizeEvent*) { recalcItemGeometry(); } void ButtonDropSite::recalcItemGeometry() { - QRect r = contentsRect(); + TQRect r = contentsRect(); // 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(); - (*it)->rect = QRect(offset, r.top(), w, (*it)->height() ); + (*it)->rect = TQRect(offset, r.top(), w, (*it)->height() ); offset += w; } @@ -513,12 +513,12 @@ void ButtonDropSite::recalcItemGeometry() offset = r.right() - calcButtonListWidth(buttonsRight); for (ButtonList::const_iterator it = buttonsRight.begin(); it != buttonsRight.end(); ++it) { int w = (*it)->width(); - (*it)->rect = QRect(offset, r.top(), w, (*it)->height() ); + (*it)->rect = TQRect(offset, r.top(), w, (*it)->height() ); offset += w; } } -ButtonDropSiteItem *ButtonDropSite::buttonAt(QPoint p) { +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.contains(p) ) { @@ -578,10 +578,10 @@ bool ButtonDropSite::removeSelectedButton() return succ; } -void ButtonDropSite::drawButtonList(QPainter *p, const ButtonList& btns, int offset) +void ButtonDropSite::drawButtonList(TQPainter *p, const ButtonList& btns, int offset) { for (ButtonList::const_iterator it = btns.begin(); it != btns.end(); ++it) { - QRect itemRect = (*it)->rect; + TQRect itemRect = (*it)->rect; if (itemRect.isValid() ) { (*it)->draw(p, colorGroup(), itemRect); } @@ -589,13 +589,13 @@ void ButtonDropSite::drawButtonList(QPainter *p, const ButtonList& btns, int off } } -void ButtonDropSite::drawContents( QPainter* p ) +void ButtonDropSite::drawContents( TQPainter* p ) { int leftoffset = calcButtonListWidth( buttonsLeft ); int rightoffset = calcButtonListWidth( buttonsRight ); int offset = 3; - QRect r = contentsRect(); + TQRect r = contentsRect(); // Shrink by 1 r.moveBy(1 + leftoffset, 1); @@ -604,10 +604,10 @@ void ButtonDropSite::drawContents( QPainter* p ) drawButtonList( p, buttonsLeft, offset ); - QColor c1( 0x0A, 0x5F, 0x89 ); // KDE 2 titlebar default colour + TQColor c1( 0x0A, 0x5F, 0x89 ); // KDE 2 titlebar default colour p->fillRect( r, c1 ); p->setPen( Qt::white ); - p->setFont( QFont( KGlobalSettings::generalFont().family(), 12, QFont::Bold) ); + p->setFont( TQFont( KGlobalSettings::generalFont().family(), 12, TQFont::Bold) ); p->drawText( r, AlignLeft | AlignVCenter, i18n("KDE") ); offset = geometry().width() - 3 - rightoffset; @@ -619,8 +619,8 @@ void ButtonDropSite::drawContents( QPainter* p ) } } -ButtonSourceItem::ButtonSourceItem(QListView * parent, const Button& btn) - : QListViewItem(parent), +ButtonSourceItem::ButtonSourceItem(TQListView * parent, const Button& btn) + : TQListViewItem(parent), m_button(btn), m_dirty(true) { @@ -631,7 +631,7 @@ ButtonSourceItem::~ButtonSourceItem() { } -void ButtonSourceItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align) +void ButtonSourceItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align) { // we need the color group cg, so to the work here, not in setButton... if (m_dirty) { @@ -644,12 +644,12 @@ void ButtonSourceItem::paintCell(QPainter *p, const QColorGroup &cg, int column, } if (m_button.supported) { - QListViewItem::paintCell(p,cg,column,width,align); + TQListViewItem::paintCell(p,cg,column,width,align); } else { // grey out unsupported buttons - QColorGroup cg2 = cg; - cg2.setColor(QColorGroup::Text, cg.mid() ); - QListViewItem::paintCell(p,cg2,column,width,align); + TQColorGroup cg2 = cg; + cg2.setColor(TQColorGroup::Text, cg.mid() ); + TQListViewItem::paintCell(p,cg2,column,width,align); } } @@ -670,16 +670,16 @@ Button ButtonSourceItem::button() const } -ButtonPositionWidget::ButtonPositionWidget(QWidget *parent, const char* name) - : QWidget(parent,name), +ButtonPositionWidget::ButtonPositionWidget(TQWidget *parent, const char* name) + : TQWidget(parent,name), m_factory(0) { - QVBoxLayout *layout = new QVBoxLayout(this, 0, KDialog::spacingHint() ); - setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint() ); + setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); - QLabel* label = new QLabel( this ); + TQLabel* label = new TQLabel( this ); m_dropSite = new ButtonDropSite( this ); - label->setAlignment( int( QLabel::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.") ); @@ -689,11 +689,11 @@ ButtonPositionWidget::ButtonPositionWidget(QWidget *parent, const char* name) layout->addWidget(m_dropSite); layout->addWidget(m_buttonSource); - connect( m_dropSite, SIGNAL(buttonAdded(QChar)), m_buttonSource, SLOT(hideButton(QChar)) ); - connect( m_dropSite, SIGNAL(buttonRemoved(QChar)), m_buttonSource, SLOT(showButton(QChar)) ); - connect( m_buttonSource, SIGNAL(dropped(QDropEvent*, QListViewItem*)), m_dropSite, SLOT(removeSelectedButton()) ); + 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)) ); + connect( m_buttonSource, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), m_dropSite, TQT_SLOT(removeSelectedButton()) ); - connect( m_dropSite, SIGNAL(changed()), SIGNAL(changed()) ); + connect( m_dropSite, TQT_SIGNAL(changed()), TQT_SIGNAL(changed()) ); // insert all possible buttons into the source (backwards to keep the preferred order...) bool dummy; @@ -723,7 +723,7 @@ void ButtonPositionWidget::setDecorationFactory(KDecorationFactory *factory) // get the list of supported buttons if (m_factory->supports(KDecorationDefines::AbilityAnnounceButtons) ) { - QString supportedButtons; + TQString supportedButtons; if (m_factory->supports(KDecorationDefines::AbilityButtonMenu) ) supportedButtons.append('M'); @@ -756,7 +756,7 @@ void ButtonPositionWidget::setDecorationFactory(KDecorationFactory *factory) // update the button lists... // 1. set status on the source items... - QListViewItemIterator it(m_buttonSource); + TQListViewItemIterator it(m_buttonSource); while (it.current() ) { ButtonSourceItem *i = dynamic_cast<ButtonSourceItem*>(it.current() ); if (i) { @@ -771,51 +771,51 @@ void ButtonPositionWidget::setDecorationFactory(KDecorationFactory *factory) setButtonsRight(buttonsRight() ); } -Button ButtonPositionWidget::getButton(QChar type, bool& success) { +Button ButtonPositionWidget::getButton(TQChar type, bool& success) { success = true; if (type == 'R') { - QBitmap bmp(resize_width, resize_height, resize_bits, true); + TQBitmap bmp(resize_width, resize_height, resize_bits, true); bmp.setMask(bmp); return Button(i18n("Resize"), bmp, 'R', false, m_supportedButtons.contains('R') ); } else if (type == 'L') { - QBitmap bmp(shade_width, shade_height, shade_bits, true); + TQBitmap bmp(shade_width, shade_height, shade_bits, true); bmp.setMask(bmp); return Button(i18n("Shade"), bmp, 'L', false, m_supportedButtons.contains('L') ); } else if (type == 'B') { - QBitmap bmp(keepbelowothers_width, keepbelowothers_height, keepbelowothers_bits, true); + TQBitmap bmp(keepbelowothers_width, keepbelowothers_height, keepbelowothers_bits, true); bmp.setMask(bmp); return Button(i18n("Keep Below Others"), bmp, 'B', false, m_supportedButtons.contains('B') ); } else if (type == 'F') { - QBitmap bmp(keepaboveothers_width, keepaboveothers_height, keepaboveothers_bits, true); + TQBitmap bmp(keepaboveothers_width, keepaboveothers_height, keepaboveothers_bits, true); bmp.setMask(bmp); return Button(i18n("Keep Above Others"), bmp, 'F', false, m_supportedButtons.contains('F') ); } else if (type == 'X') { - QBitmap bmp(close_width, close_height, close_bits, true); + TQBitmap bmp(close_width, close_height, close_bits, true); bmp.setMask(bmp); return Button(i18n("Close"), bmp, 'X', false, m_supportedButtons.contains('X') ); } else if (type == 'A') { - QBitmap bmp(maximize_width, maximize_height, maximize_bits, true); + TQBitmap bmp(maximize_width, maximize_height, maximize_bits, true); bmp.setMask(bmp); return Button(i18n("Maximize"), bmp, 'A', false, m_supportedButtons.contains('A') ); } else if (type == 'I') { - QBitmap bmp(minimize_width, minimize_height, minimize_bits, true); + TQBitmap bmp(minimize_width, minimize_height, minimize_bits, true); bmp.setMask(bmp); return Button(i18n("Minimize"), bmp, 'I', false, m_supportedButtons.contains('I') ); } else if (type == 'H') { - QBitmap bmp(help_width, help_height, help_bits, true); + TQBitmap bmp(help_width, help_height, help_bits, true); bmp.setMask(bmp); return Button(i18n("Help"), bmp, 'H', false, m_supportedButtons.contains('H') ); } else if (type == 'S') { - QBitmap bmp(onalldesktops_width, onalldesktops_height, onalldesktops_bits, true); + TQBitmap bmp(onalldesktops_width, onalldesktops_height, onalldesktops_bits, true); bmp.setMask(bmp); return Button(i18n("On All Desktops"), bmp, 'S', false, m_supportedButtons.contains('S') ); } else if (type == 'M') { - QBitmap bmp(menu_width, menu_height, menu_bits, true); + TQBitmap bmp(menu_width, menu_height, menu_bits, true); bmp.setMask(bmp); return Button(i18n("Menu"), bmp, 'M', false, m_supportedButtons.contains('M') ); } else if (type == '_') { - QBitmap bmp(spacer_width, spacer_height, spacer_bits, true); + TQBitmap bmp(spacer_width, spacer_height, spacer_bits, true); bmp.setMask(bmp); return Button(i18n("--- spacer ---"), bmp, '_', true, m_supportedButtons.contains('_') ); } else { @@ -824,27 +824,27 @@ Button ButtonPositionWidget::getButton(QChar type, bool& success) { } } -QString ButtonPositionWidget::buttonsLeft() const +TQString ButtonPositionWidget::buttonsLeft() const { ButtonList btns = m_dropSite->buttonsLeft; - QString btnString = ""; + TQString btnString = ""; for (ButtonList::const_iterator it = btns.begin(); it != btns.end(); ++it) { btnString.append( (*it)->button().type ); } return btnString; } -QString ButtonPositionWidget::buttonsRight() const +TQString ButtonPositionWidget::buttonsRight() const { ButtonList btns = m_dropSite->buttonsRight; - QString btnString = ""; + TQString btnString = ""; for (ButtonList::const_iterator it = btns.begin(); it != btns.end(); ++it) { btnString.append( (*it)->button().type ); } return btnString; } -void ButtonPositionWidget::setButtonsLeft(const QString &buttons) +void ButtonPositionWidget::setButtonsLeft(const TQString &buttons) { // to keep the button lists consistent, first remove all left buttons, then add buttons again... m_dropSite->clearLeft(); @@ -861,7 +861,7 @@ void ButtonPositionWidget::setButtonsLeft(const QString &buttons) m_dropSite->update(); } -void ButtonPositionWidget::setButtonsRight(const QString &buttons) +void ButtonPositionWidget::setButtonsRight(const TQString &buttons) { // to keep the button lists consistent, first remove all left buttons, then add buttons again... m_dropSite->clearRight(); diff --git a/kwin/kcmkwin/kwindecoration/buttons.h b/kwin/kcmkwin/kwindecoration/buttons.h index a3db6266e..0fcbff085 100644 --- a/kwin/kcmkwin/kwindecoration/buttons.h +++ b/kwin/kcmkwin/kwindecoration/buttons.h @@ -31,10 +31,10 @@ #ifndef __BUTTONS_H_ #define __BUTTONS_H_ -#include <qbitmap.h> -#include <qevent.h> -#include <qdragobject.h> -#include <qlistbox.h> +#include <tqbitmap.h> +#include <tqevent.h> +#include <tqdragobject.h> +#include <tqlistbox.h> #include <klistview.h> @@ -47,12 +47,12 @@ class Button { public: Button(); - Button(const QString& name, const QBitmap& icon, QChar type, bool duplicate, bool supported); + Button(const TQString& name, const TQBitmap& icon, TQChar type, bool duplicate, bool supported); virtual ~Button(); - QString name; - QBitmap icon; - QChar type; + TQString name; + TQBitmap icon; + TQChar type; bool duplicate; bool supported; }; @@ -60,11 +60,11 @@ class Button class ButtonDrag : public QStoredDrag { public: - ButtonDrag( Button btn, QWidget* parent, const char* name=0 ); + ButtonDrag( Button btn, TQWidget* parent, const char* name=0 ); ~ButtonDrag() {}; - static bool canDecode( QDropEvent* e ); - static bool decode( QDropEvent* e, Button& btn ); + static bool canDecode( TQDropEvent* e ); + static bool decode( TQDropEvent* e, Button& btn ); }; /** @@ -78,11 +78,11 @@ class ButtonDropSiteItem Button button(); - QRect rect; + TQRect rect; int width(); int height(); - void draw(QPainter *p, const QColorGroup& cg, QRect rect); + void draw(TQPainter *p, const TQColorGroup& cg, TQRect rect); private: Button m_button; @@ -94,10 +94,10 @@ class ButtonDropSiteItem class ButtonSourceItem : public QListViewItem { public: - ButtonSourceItem(QListView * parent, const Button& btn); + ButtonSourceItem(TQListView * parent, const Button& btn); virtual ~ButtonSourceItem(); - void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align); + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align); void setButton(const Button& btn); Button button() const; @@ -114,24 +114,24 @@ class ButtonSource : public KListView Q_OBJECT public: - ButtonSource(QWidget *parent = 0, const char* name = 0); + ButtonSource(TQWidget *parent = 0, const char* name = 0); virtual ~ButtonSource(); - QSize sizeHint() const; + TQSize sizeHint() const; void hideAllButtons(); void showAllButtons(); public slots: - void hideButton(QChar btn); - void showButton(QChar btn); + void hideButton(TQChar btn); + void showButton(TQChar btn); protected: - bool acceptDrag(QDropEvent* e) const; - virtual QDragObject *dragObject(); + bool acceptDrag(TQDropEvent* e) const; + virtual TQDragObject *dragObject(); }; -typedef QValueList<ButtonDropSiteItem*> ButtonList; +typedef TQValueList<ButtonDropSiteItem*> ButtonList; /** * This class renders and handles the demo titlebar dropsite @@ -141,7 +141,7 @@ class ButtonDropSite: public QFrame Q_OBJECT public: - ButtonDropSite( QWidget* parent=0, const char* name=0 ); + ButtonDropSite( TQWidget* parent=0, const char* name=0 ); ~ButtonDropSite(); // Allow external classes access our buttons - ensure buttons are @@ -152,8 +152,8 @@ class ButtonDropSite: public QFrame void clearRight(); signals: - void buttonAdded(QChar btn); - void buttonRemoved(QChar btn); + void buttonAdded(TQChar btn); + void buttonRemoved(TQChar btn); void changed(); public slots: @@ -161,21 +161,21 @@ class ButtonDropSite: public QFrame void recalcItemGeometry(); ///< Call this whenever the item list changes... updates the items' rect property protected: - void resizeEvent(QResizeEvent*); - void dragEnterEvent( QDragEnterEvent* e ); - void dragMoveEvent( QDragMoveEvent* e ); - void dragLeaveEvent( QDragLeaveEvent* e ); - void dropEvent( QDropEvent* e ); - void mousePressEvent( QMouseEvent* e ); ///< Starts dragging a button... - - void drawContents( QPainter* p ); - ButtonDropSiteItem *buttonAt(QPoint p); + void resizeEvent(TQResizeEvent*); + void dragEnterEvent( TQDragEnterEvent* e ); + void dragMoveEvent( TQDragMoveEvent* e ); + void dragLeaveEvent( TQDragLeaveEvent* e ); + void dropEvent( TQDropEvent* e ); + void mousePressEvent( TQMouseEvent* e ); ///< Starts dragging a button... + + void drawContents( TQPainter* p ); + ButtonDropSiteItem *buttonAt(TQPoint p); bool removeButton(ButtonDropSiteItem *item); int calcButtonListWidth(const ButtonList& buttons); ///< Computes the total space the buttons will take in the titlebar - void drawButtonList(QPainter *p, const ButtonList& buttons, int offset); + void drawButtonList(TQPainter *p, const ButtonList& buttons, int offset); - QRect leftDropArea(); - QRect rightDropArea(); + TQRect leftDropArea(); + TQRect rightDropArea(); private: /** @@ -184,7 +184,7 @@ class ButtonDropSite: public QFrame bool getItemIterator(ButtonDropSiteItem *item, ButtonList* &list, ButtonList::iterator &iterator); void cleanDropVisualizer(); - QRect m_oldDropVisualizer; + TQRect m_oldDropVisualizer; ButtonDropSiteItem *m_selected; }; @@ -194,7 +194,7 @@ class ButtonPositionWidget : public QWidget Q_OBJECT public: - ButtonPositionWidget(QWidget *parent = 0, const char* name = 0); + ButtonPositionWidget(TQWidget *parent = 0, const char* name = 0); ~ButtonPositionWidget(); /** @@ -202,23 +202,23 @@ class ButtonPositionWidget : public QWidget */ void setDecorationFactory(KDecorationFactory *factory); - QString buttonsLeft() const; - QString buttonsRight() const; - void setButtonsLeft(const QString &buttons); - void setButtonsRight(const QString &buttons); + TQString buttonsLeft() const; + TQString buttonsRight() const; + void setButtonsLeft(const TQString &buttons); + void setButtonsRight(const TQString &buttons); signals: void changed(); private: void clearButtonList(const ButtonList& btns); - Button getButton(QChar type, bool& success); + Button getButton(TQChar type, bool& success); ButtonDropSite* m_dropSite; ButtonSource *m_buttonSource; KDecorationFactory *m_factory; - QString m_supportedButtons; + TQString m_supportedButtons; }; diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp index 7435781bc..68aec85ff 100644 --- a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp +++ b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp @@ -28,17 +28,17 @@ */ #include <assert.h> -#include <qdir.h> -#include <qfileinfo.h> -#include <qlayout.h> -#include <qwhatsthis.h> -#include <qgroupbox.h> -#include <qcheckbox.h> -#include <qtabwidget.h> -#include <qvbox.h> -#include <qlabel.h> -#include <qfile.h> -#include <qslider.h> +#include <tqdir.h> +#include <tqfileinfo.h> +#include <tqlayout.h> +#include <tqwhatsthis.h> +#include <tqgroupbox.h> +#include <tqcheckbox.h> +#include <tqtabwidget.h> +#include <tqvbox.h> +#include <tqlabel.h> +#include <tqfile.h> +#include <tqslider.h> #include <kapplication.h> #include <kcombobox.h> @@ -59,10 +59,10 @@ // KCModule plugin interface // ========================= -typedef KGenericFactory<KWinDecorationModule, QWidget> KWinDecoFactory; +typedef KGenericFactory<KWinDecorationModule, TQWidget> KWinDecoFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kwindecoration, KWinDecoFactory("kcmkwindecoration") ) -KWinDecorationModule::KWinDecorationModule(QWidget* parent, const char* name, const QStringList &) +KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, const TQStringList &) : DCOPObject("KWinClientDecoration"), KCModule(KWinDecoFactory::instance(), parent, name), kwinConfig("kwinrc"), @@ -71,28 +71,28 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const char* name, co kwinConfig.setGroup("Style"); plugins = new KDecorationPreviewPlugins( &kwinConfig ); - QVBoxLayout* layout = new QVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout* layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); // Save this for later... -// cbUseMiniWindows = new QCheckBox( i18n( "Render mini &titlebars for all windows"), checkGroup ); -// QWhatsThis::add( cbUseMiniWindows, i18n( "Note that this option is not available on all styles yet!" ) ); +// 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 QTabWidget( this ); + tabWidget = new TQTabWidget( this ); layout->addWidget( tabWidget ); // Page 1 (General Options) - QWidget *pluginPage = new QWidget( tabWidget ); + TQWidget *pluginPage = new TQWidget( tabWidget ); - QVBoxLayout* pluginLayout = new QVBoxLayout(pluginPage, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout* pluginLayout = new TQVBoxLayout(pluginPage, KDialog::marginHint(), KDialog::spacingHint()); // decoration chooser decorationList = new KComboBox( pluginPage ); - QString whatsThis = i18n("Select the window decoration. This is the look and feel of both " + TQString whatsThis = i18n("Select the window decoration. This is the look and feel of both " "the window borders and the window handle."); - QWhatsThis::add(decorationList, whatsThis); + TQWhatsThis::add(decorationList, whatsThis); pluginLayout->addWidget(decorationList); - QGroupBox *pluginSettingsGrp = new QGroupBox( i18n("Decoration Options"), pluginPage ); + TQGroupBox *pluginSettingsGrp = new TQGroupBox( i18n("Decoration Options"), pluginPage ); pluginSettingsGrp->setColumnLayout( 0, Vertical ); pluginSettingsGrp->setFlat( true ); pluginSettingsGrp->layout()->setMargin( 0 ); @@ -102,33 +102,33 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const char* name, co pluginLayout->addStretch(); // Border size chooser - lBorder = new QLabel (i18n("B&order size:"), pluginSettingsGrp); - cBorder = new QComboBox(pluginSettingsGrp); + lBorder = new TQLabel (i18n("B&order size:"), pluginSettingsGrp); + cBorder = new TQComboBox(pluginSettingsGrp); lBorder->setBuddy(cBorder); - QWhatsThis::add( cBorder, i18n( "Use this combobox to change the border size of the decoration." )); + TQWhatsThis::add( cBorder, i18n( "Use this combobox to change the border size of the decoration." )); lBorder->hide(); cBorder->hide(); - QHBoxLayout *borderSizeLayout = new QHBoxLayout(pluginSettingsGrp->layout() ); + TQHBoxLayout *borderSizeLayout = new TQHBoxLayout(pluginSettingsGrp->layout() ); borderSizeLayout->addWidget(lBorder); borderSizeLayout->addWidget(cBorder); borderSizeLayout->addStretch(); - pluginConfigWidget = new QVBox(pluginSettingsGrp); + pluginConfigWidget = new TQVBox(pluginSettingsGrp); pluginSettingsGrp->layout()->add( pluginConfigWidget ); // Page 2 (Button Selector) - QWidget* buttonPage = new QWidget( tabWidget ); - QVBoxLayout* buttonLayout = new QVBoxLayout(buttonPage, KDialog::marginHint(), KDialog::spacingHint()); + TQWidget* buttonPage = new TQWidget( tabWidget ); + TQVBoxLayout* buttonLayout = new TQVBoxLayout(buttonPage, KDialog::marginHint(), KDialog::spacingHint()); - cbShowToolTips = new QCheckBox( + cbShowToolTips = new TQCheckBox( i18n("&Show window button tooltips"), buttonPage ); - QWhatsThis::add( cbShowToolTips, + TQWhatsThis::add( cbShowToolTips, i18n( "Enabling this checkbox will show window button tooltips. " "If this checkbox is off, no window button tooltips will be shown.")); - cbUseCustomButtonPositions = new QCheckBox( + cbUseCustomButtonPositions = new TQCheckBox( i18n("Use custom titlebar button &positions"), buttonPage ); - QWhatsThis::add( cbUseCustomButtonPositions, + TQWhatsThis::add( cbUseCustomButtonPositions, i18n( "The appropriate settings can be found in the \"Buttons\" Tab; " "please note that this option is not available on all styles yet." ) ); @@ -138,20 +138,20 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const char* name, co // Add nifty dnd button modification widgets buttonPositionWidget = new ButtonPositionWidget(buttonPage, "button_position_widget"); buttonPositionWidget->setDecorationFactory(plugins->factory() ); - QHBoxLayout* buttonControlLayout = new QHBoxLayout(buttonLayout); + TQHBoxLayout* buttonControlLayout = new TQHBoxLayout(buttonLayout); buttonControlLayout->addSpacing(20); buttonControlLayout->addWidget(buttonPositionWidget); // buttonLayout->addStretch(); // preview - QVBoxLayout* previewLayout = new QVBoxLayout(layout, KDialog::spacingHint() ); + TQVBoxLayout* previewLayout = new TQVBoxLayout(layout, KDialog::spacingHint() ); previewLayout->setMargin( KDialog::marginHint() ); preview = new KDecorationPreview( this ); previewLayout->addWidget(preview); - preview->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - tabWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum); + preview->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + tabWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); // Load all installed decorations into memory // Set up the decoration lists and other UI settings @@ -163,17 +163,17 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const char* name, co tabWidget->insertTab( pluginPage, i18n("&Window Decoration") ); tabWidget->insertTab( buttonPage, i18n("&Buttons") ); - connect( buttonPositionWidget, SIGNAL(changed()), this, SLOT(slotButtonsChanged()) ); // update preview etc. - connect( buttonPositionWidget, SIGNAL(changed()), this, SLOT(slotSelectionChanged()) ); // emit changed()... - connect( decorationList, SIGNAL(activated(const QString&)), SLOT(slotSelectionChanged()) ); - connect( decorationList, SIGNAL(activated(const QString&)), - SLOT(slotChangeDecoration(const QString&)) ); - connect( cbUseCustomButtonPositions, SIGNAL(clicked()), SLOT(slotSelectionChanged()) ); - connect(cbUseCustomButtonPositions, SIGNAL(toggled(bool)), buttonPositionWidget, SLOT(setEnabled(bool))); - connect(cbUseCustomButtonPositions, SIGNAL(toggled(bool)), this, SLOT(slotButtonsChanged()) ); - connect( cbShowToolTips, SIGNAL(clicked()), SLOT(slotSelectionChanged()) ); - connect( cBorder, SIGNAL( activated( int )), SLOT( slotBorderChanged( int ))); -// connect( cbUseMiniWindows, SIGNAL(clicked()), SLOT(slotSelectionChanged()) ); + connect( buttonPositionWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(slotButtonsChanged()) ); // update preview etc. + connect( buttonPositionWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(slotSelectionChanged()) ); // emit changed()... + connect( decorationList, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotSelectionChanged()) ); + connect( decorationList, TQT_SIGNAL(activated(const TQString&)), + TQT_SLOT(slotChangeDecoration(const TQString&)) ); + connect( cbUseCustomButtonPositions, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) ); + connect(cbUseCustomButtonPositions, TQT_SIGNAL(toggled(bool)), buttonPositionWidget, TQT_SLOT(setEnabled(bool))); + connect(cbUseCustomButtonPositions, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotButtonsChanged()) ); + connect( cbShowToolTips, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) ); + connect( cBorder, TQT_SIGNAL( activated( int )), TQT_SLOT( slotBorderChanged( int ))); +// connect( cbUseMiniWindows, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) ); // Allow kwin dcop signal to update our selection list connectDCOPSignal("kwin", 0, "dcopResetAllClients()", "dcopUpdateClientList()", false); @@ -199,20 +199,20 @@ KWinDecorationModule::~KWinDecorationModule() // And insert these into a DecorationInfo structure void KWinDecorationModule::findDecorations() { - QStringList dirList = KGlobal::dirs()->findDirs("data", "kwin"); - QStringList::ConstIterator it; + TQStringList dirList = KGlobal::dirs()->findDirs("data", "kwin"); + TQStringList::ConstIterator it; for (it = dirList.begin(); it != dirList.end(); it++) { - QDir d(*it); + TQDir d(*it); if (d.exists()) for (QFileInfoListIterator it(*d.entryInfoList()); it.current(); ++it) { - QString filename(it.current()->absFilePath()); + TQString filename(it.current()->absFilePath()); if (KDesktopFile::isDesktopFile(filename)) { KDesktopFile desktopFile(filename); - QString libName = desktopFile.readEntry("X-KDE-Library"); + TQString libName = desktopFile.readEntry("X-KDE-Library"); if (!libName.isEmpty() && libName.startsWith( "kwin3_" )) { @@ -230,10 +230,10 @@ void KWinDecorationModule::findDecorations() // Fills the decorationList with a list of available kwin decorations void KWinDecorationModule::createDecorationList() { - QValueList<DecorationInfo>::ConstIterator it; + TQValueList<DecorationInfo>::ConstIterator it; // Sync with kwin hardcoded KDE2 style which has no desktop item - QStringList decorationNames; + TQStringList decorationNames; decorationNames.append( i18n("KDE 2") ); for (it = decorations.begin(); it != decorations.end(); ++it) { @@ -245,7 +245,7 @@ void KWinDecorationModule::createDecorationList() // Reset the decoration plugin to what the user just selected -void KWinDecorationModule::slotChangeDecoration( const QString & text) +void KWinDecorationModule::slotChangeDecoration( const TQString & text) { KConfig kwinConfig("kwinrc"); kwinConfig.setGroup("Style"); @@ -272,10 +272,10 @@ static const char* const border_names[ KDecorationDefines::BordersCount ] = I18N_NOOP( "Oversized" ) }; -int KWinDecorationModule::borderSizeToIndex( BorderSize size, QValueList< BorderSize > sizes ) +int KWinDecorationModule::borderSizeToIndex( BorderSize size, TQValueList< BorderSize > sizes ) { int pos = 0; - for( QValueList< BorderSize >::ConstIterator it = sizes.begin(); + for( TQValueList< BorderSize >::ConstIterator it = sizes.begin(); it != sizes.end(); ++it, ++pos ) if( size <= *it ) @@ -284,9 +284,9 @@ int KWinDecorationModule::borderSizeToIndex( BorderSize size, QValueList< Border } KDecorationDefines::BorderSize KWinDecorationModule::indexToBorderSize( int index, - QValueList< BorderSize > sizes ) + TQValueList< BorderSize > sizes ) { - QValueList< BorderSize >::ConstIterator it = sizes.begin(); + TQValueList< BorderSize >::ConstIterator it = sizes.begin(); for(; it != sizes.end(); ++it, --index ) @@ -300,7 +300,7 @@ void KWinDecorationModule::slotBorderChanged( int size ) if( lBorder->isHidden()) return; emit KCModule::changed( true ); - QValueList< BorderSize > sizes; + TQValueList< BorderSize > sizes; if( plugins->factory() != NULL ) sizes = plugins->factory()->borderSizes(); assert( sizes.count() >= 2 ); @@ -316,11 +316,11 @@ void KWinDecorationModule::slotButtonsChanged() preview->setTempButtons(plugins, cbUseCustomButtonPositions->isChecked(), buttonPositionWidget->buttonsLeft(), buttonPositionWidget->buttonsRight() ); } -QString KWinDecorationModule::decorationName( QString& libName ) +TQString KWinDecorationModule::decorationName( TQString& libName ) { - QString decoName; + TQString decoName; - QValueList<DecorationInfo>::Iterator it; + TQValueList<DecorationInfo>::Iterator it; for( it = decorations.begin(); it != decorations.end(); ++it ) if ( (*it).libraryName == libName ) { @@ -332,13 +332,13 @@ QString KWinDecorationModule::decorationName( QString& libName ) } -QString KWinDecorationModule::decorationLibName( const QString& name ) +TQString KWinDecorationModule::decorationLibName( const TQString& name ) { - QString libName; + TQString libName; // Find the corresponding library name to that of // the current plugin name - QValueList<DecorationInfo>::Iterator it; + TQValueList<DecorationInfo>::Iterator it; for( it = decorations.begin(); it != decorations.end(); ++it ) if ( (*it).name == name ) { @@ -355,14 +355,14 @@ QString KWinDecorationModule::decorationLibName( const QString& name ) // Loads/unloads and inserts the decoration config plugin into the // pluginConfigWidget, allowing for dynamic configuration of decorations -void KWinDecorationModule::resetPlugin( KConfig* conf, const QString& currentDecoName ) +void KWinDecorationModule::resetPlugin( KConfig* conf, const TQString& currentDecoName ) { // Config names are "kwin_icewm_config" // for "kwin3_icewm" kwin client - QString oldName = styleToConfigLib( oldLibraryName ); + TQString oldName = styleToConfigLib( oldLibraryName ); - QString currentName; + TQString currentName; if (!currentDecoName.isEmpty()) currentName = decorationLibName( currentDecoName ); // Use what the user selected else @@ -391,23 +391,23 @@ void KWinDecorationModule::resetPlugin( KConfig* conf, const QString& currentDec // Free the old library if possible if (!oldLibraryName.isNull()) - loader->unloadLibrary( QFile::encodeName(oldName) ); + loader->unloadLibrary( TQFile::encodeName(oldName) ); - KLibrary* library = loader->library( QFile::encodeName(currentName) ); + KLibrary* library = loader->library( TQFile::encodeName(currentName) ); if (library != NULL) { void* alloc_ptr = library->symbol("allocate_config"); if (alloc_ptr != NULL) { - allocatePlugin = (QObject* (*)(KConfig* conf, QWidget* parent))alloc_ptr; - pluginObject = (QObject*)(allocatePlugin( conf, pluginConfigWidget )); + allocatePlugin = (TQObject* (*)(KConfig* conf, TQWidget* parent))alloc_ptr; + pluginObject = (TQObject*)(allocatePlugin( conf, pluginConfigWidget )); // connect required signals and slots together... - connect( pluginObject, SIGNAL(changed()), this, SLOT(slotSelectionChanged()) ); - connect( this, SIGNAL(pluginLoad(KConfig*)), pluginObject, SLOT(load(KConfig*)) ); - connect( this, SIGNAL(pluginSave(KConfig*)), pluginObject, SLOT(save(KConfig*)) ); - connect( this, SIGNAL(pluginDefaults()), pluginObject, SLOT(defaults()) ); + connect( pluginObject, TQT_SIGNAL(changed()), this, TQT_SLOT(slotSelectionChanged()) ); + connect( this, TQT_SIGNAL(pluginLoad(KConfig*)), pluginObject, TQT_SLOT(load(KConfig*)) ); + connect( this, TQT_SIGNAL(pluginSave(KConfig*)), pluginObject, TQT_SLOT(save(KConfig*)) ); + connect( this, TQT_SIGNAL(pluginDefaults()), pluginObject, TQT_SLOT(defaults()) ); pluginConfigWidget->show(); return; } @@ -431,8 +431,8 @@ void KWinDecorationModule::readConfig( KConfig* conf ) oldLibraryName = currentLibraryName; currentLibraryName = conf->readEntry("PluginLib", - ((QPixmap::defaultDepth() > 8) ? "kwin_plastik" : "kwin_quartz")); - QString decoName = decorationName( currentLibraryName ); + ((TQPixmap::defaultDepth() > 8) ? "kwin_plastik" : "kwin_quartz")); + TQString decoName = decorationName( currentLibraryName ); // If we are using the "default" kde client, use the "default" entry. if (decoName.isEmpty()) @@ -472,8 +472,8 @@ void KWinDecorationModule::readConfig( KConfig* conf ) // Writes the selected user configuration to the kwin config file void KWinDecorationModule::writeConfig( KConfig* conf ) { - QString name = decorationList->currentText(); - QString libName = decorationLibName( name ); + TQString name = decorationList->currentText(); + TQString libName = decorationLibName( name ); KConfig kwinConfig("kwinrc"); kwinConfig.setGroup("Style"); @@ -558,7 +558,7 @@ void KWinDecorationModule::defaults() void KWinDecorationModule::checkSupportedBorderSizes() { - QValueList< BorderSize > sizes; + TQValueList< BorderSize > sizes; if( plugins->factory() != NULL ) sizes = plugins->factory()->borderSizes(); if( sizes.count() < 2 ) { @@ -566,7 +566,7 @@ void KWinDecorationModule::checkSupportedBorderSizes() cBorder->hide(); } else { cBorder->clear(); - for (QValueList<BorderSize>::const_iterator it = sizes.begin(); it != sizes.end(); ++it) { + for (TQValueList<BorderSize>::const_iterator it = sizes.begin(); it != sizes.end(); ++it) { BorderSize size = *it; cBorder->insertItem(i18n(border_names[size]), borderSizeToIndex(size,sizes) ); } @@ -578,7 +578,7 @@ void KWinDecorationModule::checkSupportedBorderSizes() } } -QString KWinDecorationModule::styleToConfigLib( QString& styleLib ) +TQString KWinDecorationModule::styleToConfigLib( TQString& styleLib ) { if( styleLib.startsWith( "kwin3_" )) return "kwin_" + styleLib.mid( 6 ) + "_config"; @@ -586,7 +586,7 @@ QString KWinDecorationModule::styleToConfigLib( QString& styleLib ) return styleLib + "_config"; } -QString KWinDecorationModule::quickHelp() const +TQString KWinDecorationModule::quickHelp() const { return i18n( "<h1>Window Manager Decoration</h1>" "<p>This module allows you to choose the window border decorations, " @@ -602,7 +602,7 @@ QString KWinDecorationModule::quickHelp() const void KWinDecorationModule::resetKWin() { bool ok = kapp->dcopClient()->send("kwin*", "KWinInterface", - "reconfigure()", QByteArray()); + "reconfigure()", TQByteArray()); if (!ok) kdDebug() << "kcmkwindecoration: Could not reconfigure kwin" << endl; } diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.h b/kwin/kcmkwin/kwindecoration/kwindecoration.h index eea091ebc..126f20fa9 100644 --- a/kwin/kcmkwin/kwindecoration/kwindecoration.h +++ b/kwin/kcmkwin/kwindecoration/kwindecoration.h @@ -53,8 +53,8 @@ class KDecorationPreview; // Stores themeName and its corresponding library Name struct DecorationInfo { - QString name; - QString libraryName; + TQString name; + TQString libraryName; }; @@ -63,14 +63,14 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface Q_OBJECT public: - KWinDecorationModule(QWidget* parent, const char* name, const QStringList &); + KWinDecorationModule(TQWidget* parent, const char* name, const TQStringList &); ~KWinDecorationModule(); virtual void load(); virtual void save(); virtual void defaults(); - QString quickHelp() const; + TQString quickHelp() const; virtual void dcopUpdateClientList(); @@ -82,7 +82,7 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface protected slots: // Allows us to turn "save" on void slotSelectionChanged(); - void slotChangeDecoration( const QString & ); + void slotChangeDecoration( const TQString & ); void slotBorderChanged( int ); void slotButtonsChanged(); @@ -92,41 +92,41 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface void findDecorations(); void createDecorationList(); void updateSelection(); - QString decorationLibName( const QString& name ); - QString decorationName ( QString& libName ); - static QString styleToConfigLib( QString& styleLib ); - void resetPlugin( KConfig* conf, const QString& currentDecoName = QString::null ); + TQString decorationLibName( const TQString& name ); + TQString decorationName ( TQString& libName ); + static TQString styleToConfigLib( TQString& styleLib ); + void resetPlugin( KConfig* conf, const TQString& currentDecoName = TQString::null ); void resetKWin(); void checkSupportedBorderSizes(); - static int borderSizeToIndex( BorderSize size, QValueList< BorderSize > sizes ); - static BorderSize indexToBorderSize( int index, QValueList< BorderSize > sizes ); + static int borderSizeToIndex( BorderSize size, TQValueList< BorderSize > sizes ); + static BorderSize indexToBorderSize( int index, TQValueList< BorderSize > sizes ); - QTabWidget* tabWidget; + TQTabWidget* tabWidget; // Page 1 KComboBox* decorationList; - QValueList<DecorationInfo> decorations; + TQValueList<DecorationInfo> decorations; KDecorationPreview* preview; KDecorationPlugins* plugins; KConfig kwinConfig; - QCheckBox* cbUseCustomButtonPositions; - // QCheckBox* cbUseMiniWindows; - QCheckBox* cbShowToolTips; - QLabel* lBorder; - QComboBox* cBorder; + TQCheckBox* cbUseCustomButtonPositions; + // TQCheckBox* cbUseMiniWindows; + TQCheckBox* cbShowToolTips; + TQLabel* lBorder; + TQComboBox* cBorder; BorderSize border_size; - QObject* pluginObject; - QWidget* pluginConfigWidget; - QString currentLibraryName; - QString oldLibraryName; - QObject* (*allocatePlugin)( KConfig* conf, QWidget* parent ); + TQObject* pluginObject; + TQWidget* pluginConfigWidget; + TQString currentLibraryName; + TQString oldLibraryName; + TQObject* (*allocatePlugin)( KConfig* conf, TQWidget* parent ); // Page 2 ButtonPositionWidget *buttonPositionWidget; - QVBox* buttonPage; + TQVBox* buttonPage; }; diff --git a/kwin/kcmkwin/kwindecoration/preview.cpp b/kwin/kcmkwin/kwindecoration/preview.cpp index 8c88a3604..c9a0174f4 100644 --- a/kwin/kcmkwin/kwindecoration/preview.cpp +++ b/kwin/kcmkwin/kwindecoration/preview.cpp @@ -23,8 +23,8 @@ #include <klocale.h> #include <kconfig.h> #include <kglobal.h> -#include <qlabel.h> -#include <qstyle.h> +#include <tqlabel.h> +#include <tqstyle.h> #include <kiconloader.h> #include <X11/Xlib.h> @@ -35,8 +35,8 @@ // FRAME the preview doesn't update to reflect the changes done in the kcm -KDecorationPreview::KDecorationPreview( QWidget* parent, const char* name ) - : QWidget( parent, name ) +KDecorationPreview::KDecorationPreview( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { options = new KDecorationPreviewOptions; @@ -45,7 +45,7 @@ KDecorationPreview::KDecorationPreview( QWidget* parent, const char* name ) deco[Active] = deco[Inactive] = NULL; - no_preview = new QLabel( i18n( "No preview available.\n" + no_preview = new TQLabel( i18n( "No preview available.\n" "Most probably there\n" "was a problem loading the plugin." ), this ); @@ -99,9 +99,9 @@ void KDecorationPreview::disablePreview() no_preview->show(); } -void KDecorationPreview::resizeEvent( QResizeEvent* e ) +void KDecorationPreview::resizeEvent( TQResizeEvent* e ) { - QWidget::resizeEvent( e ); + TQWidget::resizeEvent( e ); positionPreviews(); } @@ -109,8 +109,8 @@ void KDecorationPreview::positionPreviews() { int titleBarHeight, leftBorder, rightBorder, xoffset, dummy1, dummy2, dummy3; - QRect geometry; - QSize size; + TQRect geometry; + TQSize size; no_preview->resize( this->size() ); @@ -122,25 +122,25 @@ void KDecorationPreview::positionPreviews() deco[Inactive]->borders( leftBorder, rightBorder, dummy1, dummy2 ); titleBarHeight = kMin( int( titleBarHeight * .9 ), 30 ); - xoffset = kMin( kMax( 10, QApplication::reverseLayout() + xoffset = kMin( kMax( 10, TQApplication::reverseLayout() ? leftBorder : rightBorder ), 30 ); // Resize the active window - size = QSize( width() - xoffset, height() - titleBarHeight ) + size = TQSize( width() - xoffset, height() - titleBarHeight ) .expandedTo( deco[Active]->minimumSize() ); - geometry = QRect( QPoint( 0, titleBarHeight ), size ); - deco[Active]->widget()->setGeometry( QStyle::visualRect( geometry, this ) ); + geometry = TQRect( TQPoint( 0, titleBarHeight ), size ); + deco[Active]->widget()->setGeometry( TQStyle::visualRect( geometry, this ) ); // Resize the inactive window - size = QSize( width() - xoffset, height() - titleBarHeight ) + size = TQSize( width() - xoffset, height() - titleBarHeight ) .expandedTo( deco[Inactive]->minimumSize() ); - geometry = QRect( QPoint( xoffset, 0 ), size ); - deco[Inactive]->widget()->setGeometry( QStyle::visualRect( geometry, this ) ); + geometry = TQRect( TQPoint( xoffset, 0 ), size ); + deco[Inactive]->widget()->setGeometry( TQStyle::visualRect( geometry, this ) ); } -void KDecorationPreview::setPreviewMask( const QRegion& reg, int mode, bool active ) +void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool active ) { - QWidget *widget = active ? deco[Active]->widget() : deco[Inactive]->widget(); + TQWidget *widget = active ? deco[Active]->widget() : deco[Inactive]->widget(); // FRAME duped from client.cpp if( mode == Unsorted ) @@ -150,7 +150,7 @@ void KDecorationPreview::setPreviewMask( const QRegion& reg, int mode, bool acti } else { - QMemArray< QRect > rects = reg.rects(); + TQMemArray< TQRect > rects = reg.rects(); XRectangle* xrects = new XRectangle[ rects.count() ]; for( unsigned int i = 0; i < rects.count(); @@ -169,9 +169,9 @@ void KDecorationPreview::setPreviewMask( const QRegion& reg, int mode, bool acti mask = reg; // keep shape of the active window for unobscuredRegion() } -QRect KDecorationPreview::windowGeometry( bool active ) const +TQRect KDecorationPreview::windowGeometry( bool active ) const { - QWidget *widget = active ? deco[Active]->widget() : deco[Inactive]->widget(); + TQWidget *widget = active ? deco[Active]->widget() : deco[Inactive]->widget(); return widget->geometry(); } @@ -190,7 +190,7 @@ void KDecorationPreview::setTempBorderSize(KDecorationPlugins* plugin, KDecorati } } -void KDecorationPreview::setTempButtons(KDecorationPlugins* plugin, bool customEnabled, const QString &left, const QString &right) +void KDecorationPreview::setTempButtons(KDecorationPlugins* plugin, bool customEnabled, const TQString &left, const TQString &right) { options->setCustomTitleButtonsEnabled(customEnabled); options->setCustomTitleButtons(left, right); @@ -206,17 +206,17 @@ void KDecorationPreview::setTempButtons(KDecorationPlugins* plugin, bool customE } } -QRegion KDecorationPreview::unobscuredRegion( bool active, const QRegion& r ) const +TQRegion KDecorationPreview::unobscuredRegion( bool active, const TQRegion& r ) const { if( active ) // this one is not obscured return r; else { // copied from KWin core's code - QRegion ret = r; - QRegion r2 = mask; + TQRegion ret = r; + TQRegion r2 = mask; if( r2.isEmpty()) - r2 = QRegion( windowGeometry( true )); + r2 = TQRegion( windowGeometry( true )); r2.translate( windowGeometry( true ).x() - windowGeometry( false ).x(), windowGeometry( true ).y() - windowGeometry( false ).y()); ret -= r2; @@ -229,7 +229,7 @@ KDecorationPreviewBridge::KDecorationPreviewBridge( KDecorationPreview* p, bool { } -QWidget* KDecorationPreviewBridge::initialParentWidget() const +TQWidget* KDecorationPreviewBridge::initialParentWidget() const { return preview; } @@ -319,26 +319,26 @@ NET::WindowType KDecorationPreviewBridge::windowType( unsigned long ) const return NET::Normal; } -QIconSet KDecorationPreviewBridge::icon() const +TQIconSet KDecorationPreviewBridge::icon() const { - return QIconSet( KGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 16 ), + return TQIconSet( KGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 16 ), KGlobal::iconLoader()->loadIcon( "xapp", KIcon::NoGroup, 32 )); } -QString KDecorationPreviewBridge::caption() const +TQString KDecorationPreviewBridge::caption() const { return active ? i18n( "Active Window" ) : i18n( "Inactive Window" ); } -void KDecorationPreviewBridge::processMousePressEvent( QMouseEvent* ) +void KDecorationPreviewBridge::processMousePressEvent( TQMouseEvent* ) { } -void KDecorationPreviewBridge::showWindowMenu( const QRect &) +void KDecorationPreviewBridge::showWindowMenu( const TQRect &) { } -void KDecorationPreviewBridge::showWindowMenu( QPoint ) +void KDecorationPreviewBridge::showWindowMenu( TQPoint ) { } @@ -346,7 +346,7 @@ void KDecorationPreviewBridge::performWindowOperation( WindowOperation ) { } -void KDecorationPreviewBridge::setMask( const QRegion& reg, int mode ) +void KDecorationPreviewBridge::setMask( const TQRegion& reg, int mode ) { preview->setPreviewMask( reg, mode, active ); } @@ -356,22 +356,22 @@ bool KDecorationPreviewBridge::isPreview() const return true; } -QRect KDecorationPreviewBridge::geometry() const +TQRect KDecorationPreviewBridge::geometry() const { return preview->windowGeometry( active ); } -QRect KDecorationPreviewBridge::iconGeometry() const +TQRect KDecorationPreviewBridge::iconGeometry() const { - return QRect(); + return TQRect(); } -QRegion KDecorationPreviewBridge::unobscuredRegion( const QRegion& r ) const +TQRegion KDecorationPreviewBridge::unobscuredRegion( const TQRegion& r ) const { return preview->unobscuredRegion( active, r ); } -QWidget* KDecorationPreviewBridge::workspaceWidget() const +TQWidget* KDecorationPreviewBridge::workspaceWidget() const { return preview; } @@ -439,8 +439,8 @@ KDecorationPreviewOptions::KDecorationPreviewOptions() customBorderSize = BordersCount; // invalid customButtonsChanged = false; // invalid customButtons = true; - customTitleButtonsLeft = QString::null; // invalid - customTitleButtonsRight = QString::null; // invalid + customTitleButtonsLeft = TQString::null; // invalid + customTitleButtonsRight = TQString::null; // invalid d = new KDecorationOptionsPrivate; d->defaultKWinSettings(); @@ -491,7 +491,7 @@ void KDecorationPreviewOptions::setCustomTitleButtonsEnabled(bool enabled) updateSettings(); } -void KDecorationPreviewOptions::setCustomTitleButtons(const QString &left, const QString &right) +void KDecorationPreviewOptions::setCustomTitleButtons(const TQString &left, const TQString &right) { customTitleButtonsLeft = left; customTitleButtonsRight = right; diff --git a/kwin/kcmkwin/kwindecoration/preview.h b/kwin/kcmkwin/kwindecoration/preview.h index 1c1943486..a7f50d682 100644 --- a/kwin/kcmkwin/kwindecoration/preview.h +++ b/kwin/kcmkwin/kwindecoration/preview.h @@ -20,7 +20,7 @@ #ifndef KWINDECORATION_PREVIEW_H #define KWINDECORATION_PREVIEW_H -#include <qwidget.h> +#include <tqwidget.h> #include <kdecoration_p.h> #include <kdecoration_plugins_p.h> @@ -39,25 +39,25 @@ class KDecorationPreview // and an inactive window. enum Windows { Inactive = 0, Active, NumWindows }; - KDecorationPreview( QWidget* parent = NULL, const char* name = NULL ); + KDecorationPreview( TQWidget* parent = NULL, const char* name = NULL ); virtual ~KDecorationPreview(); bool recreateDecoration( KDecorationPlugins* plugin ); void enablePreview(); void disablePreview(); - void setPreviewMask( const QRegion&, int, bool ); - QRegion unobscuredRegion( bool, const QRegion& ) const; - QRect windowGeometry( bool ) const; + void setPreviewMask( const TQRegion&, int, bool ); + TQRegion unobscuredRegion( bool, const TQRegion& ) const; + TQRect windowGeometry( bool ) const; void setTempBorderSize(KDecorationPlugins* plugin, KDecorationDefines::BorderSize size); - void setTempButtons(KDecorationPlugins* plugin, bool customEnabled, const QString &left, const QString &right); + void setTempButtons(KDecorationPlugins* plugin, bool customEnabled, const TQString &left, const TQString &right); protected: - virtual void resizeEvent( QResizeEvent* ); + virtual void resizeEvent( TQResizeEvent* ); private: void positionPreviews(); KDecorationPreviewOptions* options; KDecorationPreviewBridge* bridge[NumWindows]; KDecoration* deco[NumWindows]; - QLabel* no_preview; - QRegion mask; + TQLabel* no_preview; + TQRegion mask; }; class KDecorationPreviewBridge @@ -81,18 +81,18 @@ class KDecorationPreviewBridge virtual bool isMovable() const; virtual bool isResizable() const; virtual NET::WindowType windowType( unsigned long supported_types ) const; - virtual QIconSet icon() const; - virtual QString caption() const; - virtual void processMousePressEvent( QMouseEvent* ); - virtual void showWindowMenu( const QRect &); - virtual void showWindowMenu( QPoint ); + virtual TQIconSet icon() const; + virtual TQString caption() const; + virtual void processMousePressEvent( TQMouseEvent* ); + virtual void showWindowMenu( const TQRect &); + virtual void showWindowMenu( TQPoint ); virtual void performWindowOperation( WindowOperation ); - virtual void setMask( const QRegion&, int ); + virtual void setMask( const TQRegion&, int ); virtual bool isPreview() const; - virtual QRect geometry() const; - virtual QRect iconGeometry() const; - virtual QRegion unobscuredRegion( const QRegion& r ) const; - virtual QWidget* workspaceWidget() const; + virtual TQRect geometry() const; + virtual TQRect iconGeometry() const; + virtual TQRegion unobscuredRegion( const TQRegion& r ) const; + virtual TQWidget* workspaceWidget() const; virtual WId windowId() const; virtual void closeWindow(); virtual void maximize( MaximizeMode mode ); @@ -105,7 +105,7 @@ class KDecorationPreviewBridge virtual void setKeepAbove( bool ); virtual void setKeepBelow( bool ); virtual int currentDesktop() const; - virtual QWidget* initialParentWidget() const; + virtual TQWidget* initialParentWidget() const; virtual Qt::WFlags initialWFlags() const; virtual void helperShowHide( bool show ); virtual void grabXServer( bool grab ); @@ -124,14 +124,14 @@ class KDecorationPreviewOptions void setCustomBorderSize(BorderSize size); void setCustomTitleButtonsEnabled(bool enabled); - void setCustomTitleButtons(const QString &left, const QString &right); + void setCustomTitleButtons(const TQString &left, const TQString &right); private: BorderSize customBorderSize; bool customButtonsChanged; bool customButtons; - QString customTitleButtonsLeft; - QString customTitleButtonsRight; + TQString customTitleButtonsLeft; + TQString customTitleButtonsRight; }; class KDecorationPreviewPlugins diff --git a/kwin/kcmkwin/kwinoptions/main.cpp b/kwin/kcmkwin/kwinoptions/main.cpp index fbc70e4c8..ac19a5d30 100644 --- a/kwin/kcmkwin/kwinoptions/main.cpp +++ b/kwin/kcmkwin/kwinoptions/main.cpp @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qlayout.h> +#include <tqlayout.h> #include <dcopclient.h> @@ -36,7 +36,7 @@ extern "C" { - KDE_EXPORT KCModule *create_kwinfocus(QWidget *parent, const char *name) + KDE_EXPORT KCModule *create_kwinfocus(TQWidget *parent, const char *name) { //CT there's need for decision: kwm or kwin? KGlobal::locale()->insertCatalogue("kcmkwm"); @@ -44,14 +44,14 @@ extern "C" return new KFocusConfig(true, c, parent, name); } - KDE_EXPORT KCModule *create_kwinactions(QWidget *parent, const char *name) + KDE_EXPORT KCModule *create_kwinactions(TQWidget *parent, const char *name) { //CT there's need for decision: kwm or kwin? KGlobal::locale()->insertCatalogue("kcmkwm"); return new KActionsOptions( parent, name); } - KDE_EXPORT KCModule *create_kwinmoving(QWidget *parent, const char *name) + KDE_EXPORT KCModule *create_kwinmoving(TQWidget *parent, const char *name) { //CT there's need for decision: kwm or kwin? KGlobal::locale()->insertCatalogue("kcmkwm"); @@ -59,7 +59,7 @@ extern "C" return new KMovingConfig(true, c, parent, name); } - KDE_EXPORT KCModule *create_kwinadvanced(QWidget *parent, const char *name) + KDE_EXPORT KCModule *create_kwinadvanced(TQWidget *parent, const char *name) { //CT there's need for decision: kwm or kwin? KGlobal::locale()->insertCatalogue("kcmkwm"); @@ -67,7 +67,7 @@ extern "C" return new KAdvancedConfig(true, c, parent, name); } - KDE_EXPORT KCModule *create_kwintranslucency(QWidget *parent, const char *name) + KDE_EXPORT KCModule *create_kwintranslucency(TQWidget *parent, const char *name) { //CT there's need for decision: kwm or kwin? KGlobal::locale()->insertCatalogue("kcmkwm"); @@ -75,7 +75,7 @@ extern "C" return new KTranslucencyConfig(true, c, parent, name); } - KDE_EXPORT KCModule *create_kwinoptions ( QWidget *parent, const char* name) + KDE_EXPORT KCModule *create_kwinoptions ( TQWidget *parent, const char* name) { //CT there's need for decision: kwm or kwin? KGlobal::locale()->insertCatalogue("kcmkwm"); @@ -83,44 +83,44 @@ extern "C" } } -KWinOptions::KWinOptions(QWidget *parent, const char *name) +KWinOptions::KWinOptions(TQWidget *parent, const char *name) : KCModule(parent, name) { mConfig = new KConfig("kwinrc", false, true); - QVBoxLayout *layout = new QVBoxLayout(this); - tab = new QTabWidget(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); + tab = new TQTabWidget(this); layout->addWidget(tab); mFocus = new KFocusConfig(false, mConfig, this, "KWin Focus Config"); mFocus->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mFocus, i18n("&Focus")); - connect(mFocus, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool))); + connect(mFocus, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); mTitleBarActions = new KTitleBarActionsConfig(false, mConfig, this, "KWin TitleBar Actions"); mTitleBarActions->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mTitleBarActions, i18n("&Titlebar Actions")); - connect(mTitleBarActions, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool))); + connect(mTitleBarActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); mWindowActions = new KWindowActionsConfig(false, mConfig, this, "KWin Window Actions"); mWindowActions->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mWindowActions, i18n("Window Actio&ns")); - connect(mWindowActions, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool))); + connect(mWindowActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); mMoving = new KMovingConfig(false, mConfig, this, "KWin Moving"); mMoving->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mMoving, i18n("&Moving")); - connect(mMoving, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool))); + connect(mMoving, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); mAdvanced = new KAdvancedConfig(false, mConfig, this, "KWin Advanced"); mAdvanced->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mAdvanced, i18n("Ad&vanced")); - connect(mAdvanced, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool))); + connect(mAdvanced, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); mTranslucency = new KTranslucencyConfig(false, mConfig, this, "KWin Translucency"); mTranslucency->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mTranslucency, i18n("&Translucency")); - connect(mTranslucency, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool))); + connect(mTranslucency, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); KAboutData *about = new KAboutData(I18N_NOOP("kcmkwinoptions"), I18N_NOOP("Window Behavior Configuration Module"), @@ -185,7 +185,7 @@ void KWinOptions::defaults() mTranslucency->defaults(); } -QString KWinOptions::quickHelp() const +TQString KWinOptions::quickHelp() const { return i18n("<h1>Window Behavior</h1> Here you can customize the way windows behave when being" " moved, resized or clicked on. You can also specify a focus policy as well as a placement" @@ -201,24 +201,24 @@ void KWinOptions::moduleChanged(bool state) } -KActionsOptions::KActionsOptions(QWidget *parent, const char *name) +KActionsOptions::KActionsOptions(TQWidget *parent, const char *name) : KCModule(parent, name) { mConfig = new KConfig("kwinrc", false, true); - QVBoxLayout *layout = new QVBoxLayout(this); - tab = new QTabWidget(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); + tab = new TQTabWidget(this); layout->addWidget(tab); mTitleBarActions = new KTitleBarActionsConfig(false, mConfig, this, "KWin TitleBar Actions"); mTitleBarActions->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mTitleBarActions, i18n("&Titlebar Actions")); - connect(mTitleBarActions, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool))); + connect(mTitleBarActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); mWindowActions = new KWindowActionsConfig(false, mConfig, this, "KWin Window Actions"); mWindowActions->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mWindowActions, i18n("Window Actio&ns")); - connect(mWindowActions, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool))); + connect(mWindowActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); } KActionsOptions::~KActionsOptions() diff --git a/kwin/kcmkwin/kwinoptions/main.h b/kwin/kcmkwin/kwinoptions/main.h index e8591c13f..2465c6766 100644 --- a/kwin/kcmkwin/kwinoptions/main.h +++ b/kwin/kcmkwin/kwinoptions/main.h @@ -25,7 +25,7 @@ #ifndef __MAIN_H__ #define __MAIN_H__ -#include <qtabwidget.h> +#include <tqtabwidget.h> #include <kcmodule.h> class KConfig; @@ -41,13 +41,13 @@ class KWinOptions : public KCModule public: - KWinOptions(QWidget *parent, const char *name); + KWinOptions(TQWidget *parent, const char *name); virtual ~KWinOptions(); void load(); void save(); void defaults(); - QString quickHelp() const; + TQString quickHelp() const; protected slots: @@ -57,7 +57,7 @@ protected slots: private: - QTabWidget *tab; + TQTabWidget *tab; KFocusConfig *mFocus; KTitleBarActionsConfig *mTitleBarActions; @@ -75,7 +75,7 @@ class KActionsOptions : public KCModule public: - KActionsOptions(QWidget *parent, const char *name); + KActionsOptions(TQWidget *parent, const char *name); virtual ~KActionsOptions(); void load(); @@ -89,7 +89,7 @@ protected slots: private: - QTabWidget *tab; + TQTabWidget *tab; KTitleBarActionsConfig *mTitleBarActions; KWindowActionsConfig *mWindowActions; diff --git a/kwin/kcmkwin/kwinoptions/mouse.cpp b/kwin/kcmkwin/kwinoptions/mouse.cpp index f220bbfa9..6adba1f89 100644 --- a/kwin/kcmkwin/kwinoptions/mouse.cpp +++ b/kwin/kcmkwin/kwinoptions/mouse.cpp @@ -17,16 +17,16 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qlabel.h> -#include <qcombobox.h> -#include <qwhatsthis.h> -#include <qlayout.h> -#include <qvgroupbox.h> -#include <qgrid.h> -#include <qsizepolicy.h> -#include <qbitmap.h> -#include <qhgroupbox.h> -#include <qtooltip.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqwhatsthis.h> +#include <tqlayout.h> +#include <tqvgroupbox.h> +#include <tqgrid.h> +#include <tqsizepolicy.h> +#include <tqbitmap.h> +#include <tqhgroupbox.h> +#include <tqtooltip.h> #include <dcopclient.h> #include <klocale.h> @@ -60,7 +60,7 @@ char const * const tbl_Max[] = { "Maximize (horizontal only)", "" }; -QPixmap maxButtonPixmaps[3]; +TQPixmap maxButtonPixmaps[3]; void createMaxButtonPixmaps() { @@ -109,14 +109,14 @@ void createMaxButtonPixmaps() "..............."}, }; - QString baseColor(". c " + KGlobalSettings::baseColor().name()); - QString textColor("# c " + KGlobalSettings::textColor().name()); + TQString baseColor(". c " + KGlobalSettings::baseColor().name()); + TQString textColor("# c " + KGlobalSettings::textColor().name()); for (int t = 0; t < 3; ++t) { maxButtonXpms[t][0] = "15 13 2 1"; maxButtonXpms[t][1] = baseColor.ascii(); maxButtonXpms[t][2] = textColor.ascii(); - maxButtonPixmaps[t] = QPixmap(maxButtonXpms[t]); + maxButtonPixmaps[t] = TQPixmap(maxButtonXpms[t]); maxButtonPixmaps[t].setMask(maxButtonPixmaps[t].createHeuristicMask()); } } @@ -132,29 +132,29 @@ void KTitleBarActionsConfig::paletteChanged() } -KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_config, QWidget * parent, const char *) +KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_config, TQWidget * parent, const char *) : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) { - QString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3; - QVBoxLayout *layout = new QVBoxLayout(this, 0, KDialog::spacingHint()); - QGrid *grid; - QGroupBox *box; - QLabel *label; - QString strMouseButton1, strMouseButton3, strMouseWheel; - QString txtButton1, txtButton3, txtButton4; - QStringList items; + TQString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3; + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQGrid *grid; + TQGroupBox *box; + TQLabel *label; + TQString strMouseButton1, strMouseButton3, strMouseWheel; + TQString txtButton1, txtButton3, txtButton4; + TQStringList items; bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded); /** Titlebar doubleclick ************/ - QHBoxLayout *hlayout = new QHBoxLayout(layout); + TQHBoxLayout *hlayout = new TQHBoxLayout(layout); - label = new QLabel(i18n("&Titlebar double-click:"), this); + label = new TQLabel(i18n("&Titlebar double-click:"), this); hlayout->addWidget(label); - QWhatsThis::add( label, i18n("Here you can customize mouse click behavior when double clicking on the" + TQWhatsThis::add( label, i18n("Here you can customize mouse click behavior when double clicking on the" " titlebar of a window.") ); - QComboBox* combo = new QComboBox(this); + TQComboBox* combo = new TQComboBox(this); combo->insertItem(i18n("Maximize")); combo->insertItem(i18n("Maximize (vertical only)")); combo->insertItem(i18n("Maximize (horizontal only)")); @@ -163,24 +163,24 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf combo->insertItem(i18n("Lower")); combo->insertItem(i18n("On All Desktops")); combo->insertItem(i18n("Nothing")); - combo->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed)); - connect(combo, SIGNAL(activated(int)), SLOT(changed())); + combo->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); + connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); hlayout->addWidget(combo); coTiDbl = combo; - QWhatsThis::add(combo, i18n("Behavior on <em>double</em> click into the titlebar.")); + TQWhatsThis::add(combo, i18n("Behavior on <em>double</em> click into the titlebar.")); label->setBuddy(combo); /** Mouse Wheel Events **************/ - QHBoxLayout *hlayoutW = new QHBoxLayout(layout); + TQHBoxLayout *hlayoutW = new TQHBoxLayout(layout); strMouseWheel = i18n("Titlebar wheel event:"); - label = new QLabel(strMouseWheel, this); + label = new TQLabel(strMouseWheel, this); hlayoutW->addWidget(label); txtButton4 = i18n("Handle mouse wheel events"); - QWhatsThis::add( label, txtButton4); + TQWhatsThis::add( label, txtButton4); // Titlebar and frame mouse Wheel - QComboBox* comboW = new QComboBox(this); + TQComboBox* comboW = new TQComboBox(this); comboW->insertItem(i18n("Raise/Lower")); comboW->insertItem(i18n("Shade/Unshade")); comboW->insertItem(i18n("Maximize/Restore")); @@ -188,26 +188,26 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf comboW->insertItem(i18n("Move to Previous/Next Desktop")); comboW->insertItem(i18n("Change Opacity")); comboW->insertItem(i18n("Nothing")); - comboW->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed)); - connect(comboW, SIGNAL(activated(int)), SLOT(changed())); + comboW->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); + connect(comboW, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); hlayoutW->addWidget(comboW); coTiAct4 = comboW; - QWhatsThis::add(comboW, txtButton4); + TQWhatsThis::add(comboW, txtButton4); label->setBuddy(comboW); /** Titlebar and frame **************/ - box = new QVGroupBox( i18n("Titlebar && Frame"), this, "Titlebar and Frame"); + box = new TQVGroupBox( i18n("Titlebar && Frame"), this, "Titlebar and Frame"); box->layout()->setMargin(KDialog::marginHint()); box->layout()->setSpacing(KDialog::spacingHint()); layout->addWidget(box); - QWhatsThis::add( box, i18n("Here you can customize mouse click behavior when clicking on the" + TQWhatsThis::add( box, i18n("Here you can customize mouse click behavior when clicking on the" " titlebar or the frame of a window.") ); - grid = new QGrid(4, Qt::Vertical, box); + grid = new TQGrid(4, Qt::Vertical, box); - new QLabel(grid); // dummy + new TQLabel(grid); // dummy strMouseButton1 = i18n("Left button:"); txtButton1 = i18n("In this row you can customize left click behavior when clicking into" @@ -223,30 +223,30 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf qSwap(txtButton1, txtButton3); } - label = new QLabel(strMouseButton1, grid); - QWhatsThis::add( label, txtButton1); + label = new TQLabel(strMouseButton1, grid); + TQWhatsThis::add( label, txtButton1); - label = new QLabel(i18n("Middle button:"), grid); - QWhatsThis::add( label, i18n("In this row you can customize middle click behavior when clicking into" + label = new TQLabel(i18n("Middle button:"), grid); + TQWhatsThis::add( label, i18n("In this row you can customize middle click behavior when clicking into" " the titlebar or the frame.") ); - label = new QLabel(strMouseButton3, grid); - QWhatsThis::add( label, txtButton3); + label = new TQLabel(strMouseButton3, grid); + TQWhatsThis::add( label, txtButton3); - label = new QLabel(i18n("Active"), grid); + label = new TQLabel(i18n("Active"), grid); label->setAlignment(AlignCenter); - QWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar" + TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar" " or the frame of an active window.") ); // Titlebar and frame, active, mouse button 1 - combo = new QComboBox(grid); + combo = new TQComboBox(grid); combo->insertItem(i18n("Raise")); combo->insertItem(i18n("Lower")); combo->insertItem(i18n("Operations Menu")); combo->insertItem(i18n("Toggle Raise & Lower")); combo->insertItem(i18n("Nothing")); - connect(combo, SIGNAL(activated(int)), SLOT(changed())); + connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); coTiAct1 = combo; txtButton1 = i18n("Behavior on <em>left</em> click into the titlebar or frame of an " @@ -258,7 +258,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf // Be nice to left handed users if ( leftHandedMouse ) qSwap(txtButton1, txtButton3); - QWhatsThis::add(combo, txtButton1); + TQWhatsThis::add(combo, txtButton1); // Titlebar and frame, active, mouse button 2 @@ -269,18 +269,18 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf << i18n("Nothing") << i18n("Shade"); - combo = new QComboBox(grid); + combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, SIGNAL(activated(int)), SLOT(changed())); + connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); coTiAct2 = combo; - QWhatsThis::add(combo, i18n("Behavior on <em>middle</em> click into the titlebar or frame of an <em>active</em> window.")); + TQWhatsThis::add(combo, i18n("Behavior on <em>middle</em> click into the titlebar or frame of an <em>active</em> window.")); // Titlebar and frame, active, mouse button 3 - combo = new QComboBox(grid); + combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, SIGNAL(activated(int)), SLOT(changed())); + connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); coTiAct3 = combo; - QWhatsThis::add(combo, txtButton3 ); + TQWhatsThis::add(combo, txtButton3 ); txtButton1 = i18n("Behavior on <em>left</em> click into the titlebar or frame of an " "<em>inactive</em> window."); @@ -291,9 +291,9 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf // Be nice to left handed users if ( leftHandedMouse ) qSwap(txtButton1, txtButton3); - label = new QLabel(i18n("Inactive"), grid); + label = new TQLabel(i18n("Inactive"), grid); label->setAlignment(AlignCenter); - QWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar" + TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar" " or the frame of an inactive window.") ); items.clear(); @@ -306,39 +306,39 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf << i18n("Lower") << i18n("Nothing"); - combo = new QComboBox(grid); + combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, SIGNAL(activated(int)), SLOT(changed())); + connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); coTiInAct1 = combo; - QWhatsThis::add(combo, txtButton1); + TQWhatsThis::add(combo, txtButton1); - combo = new QComboBox(grid); + combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, SIGNAL(activated(int)), SLOT(changed())); + connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); coTiInAct2 = combo; - QWhatsThis::add(combo, i18n("Behavior on <em>middle</em> click into the titlebar or frame of an <em>inactive</em> window.")); + TQWhatsThis::add(combo, i18n("Behavior on <em>middle</em> click into the titlebar or frame of an <em>inactive</em> window.")); - combo = new QComboBox(grid); + combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, SIGNAL(activated(int)), SLOT(changed())); + connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); coTiInAct3 = combo; - QWhatsThis::add(combo, txtButton3); + TQWhatsThis::add(combo, txtButton3); /** Maximize Button ******************/ - box = new QHGroupBox(i18n("Maximize Button"), this, "Maximize Button"); + box = new TQHGroupBox(i18n("Maximize Button"), this, "Maximize Button"); box->layout()->setMargin(KDialog::marginHint()); box->layout()->setSpacing(KDialog::spacingHint()); layout->addWidget(box); - QWhatsThis::add( box, + TQWhatsThis::add( box, i18n("Here you can customize behavior when clicking on the maximize button.") ); - QString strMouseButton[] = { + TQString strMouseButton[] = { i18n("Left button:"), i18n("Middle button:"), i18n("Right button:")}; - QString txtButton[] = { + TQString txtButton[] = { i18n("Behavior on <em>left</em> click onto the maximize button." ), i18n("Behavior on <em>middle</em> click onto the maximize button." ), i18n("Behavior on <em>right</em> click onto the maximize button." )}; @@ -352,21 +352,21 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf createMaxButtonPixmaps(); for (int b = 0; b < 3; ++b) { - if (b != 0) new QWidget(box); // Spacer + if (b != 0) new TQWidget(box); // Spacer - QLabel * label = new QLabel(strMouseButton[b], box); - QWhatsThis::add( label, txtButton[b] ); - label ->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Minimum )); + TQLabel * label = new TQLabel(strMouseButton[b], box); + TQWhatsThis::add( label, txtButton[b] ); + 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], SIGNAL(activated(int)), SLOT(changed())); - connect(coMax[b], SIGNAL(activated(int)), coMax[b], SLOT(changed())); - QWhatsThis::add( coMax[b], txtButton[b] ); - coMax[b]->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Minimum )); + 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]->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); } - connect(kapp, SIGNAL(kdisplayPaletteChanged()), SLOT(paletteChanged())); + connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged())); layout->addStretch(); @@ -483,7 +483,7 @@ static int tbl_txt_lookup( const char* const arr[], const char* txt ) return 0; } -void KTitleBarActionsConfig::setComboText( QComboBox* combo, const char*txt ) +void KTitleBarActionsConfig::setComboText( TQComboBox* combo, const char*txt ) { if( combo == coTiDbl ) combo->setCurrentItem( tbl_txt_lookup( tbl_TiDbl, txt )); @@ -584,29 +584,29 @@ void KTitleBarActionsConfig::defaults() } -KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, QWidget * parent, const char *) +KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, TQWidget * parent, const char *) : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) { - QString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3, strAllW; - QVBoxLayout *layout = new QVBoxLayout(this, 0, KDialog::spacingHint()); - QGrid *grid; - QGroupBox *box; - QLabel *label; - QString strMouseButton1, strMouseButton3; - QString txtButton1, txtButton3; - QStringList items; + TQString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3, strAllW; + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQGrid *grid; + TQGroupBox *box; + TQLabel *label; + TQString strMouseButton1, strMouseButton3; + TQString txtButton1, txtButton3; + TQStringList items; bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded); /** Inactive inner window ******************/ - box = new QVGroupBox(i18n("Inactive Inner Window"), this, "Inactive Inner Window"); + box = new TQVGroupBox(i18n("Inactive Inner Window"), this, "Inactive Inner Window"); box->layout()->setMargin(KDialog::marginHint()); box->layout()->setSpacing(KDialog::spacingHint()); layout->addWidget(box); - QWhatsThis::add( box, i18n("Here you can customize mouse click behavior when clicking on an inactive" + TQWhatsThis::add( box, i18n("Here you can customize mouse click behavior when clicking on an inactive" " inner window ('inner' means: not titlebar, not frame).") ); - grid = new QGrid(3, Qt::Vertical, box); + grid = new TQGrid(3, Qt::Vertical, box); strMouseButton1 = i18n("Left button:"); txtButton1 = i18n("In this row you can customize left click behavior when clicking into" @@ -631,16 +631,16 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, // Be nice to lefties if ( leftHandedMouse ) qSwap(strWin1, strWin3); - label = new QLabel(strMouseButton1, grid); - QWhatsThis::add( label, strWin1 ); + label = new TQLabel(strMouseButton1, grid); + TQWhatsThis::add( label, strWin1 ); - label = new QLabel(i18n("Middle button:"), grid); + label = new TQLabel(i18n("Middle button:"), grid); strWin2 = i18n("In this row you can customize middle click behavior when clicking into" " an inactive inner window ('inner' means: not titlebar, not frame)."); - QWhatsThis::add( label, strWin2 ); + TQWhatsThis::add( label, strWin2 ); - label = new QLabel(strMouseButton3, grid); - QWhatsThis::add( label, strWin3 ); + label = new TQLabel(strMouseButton3, grid); + TQWhatsThis::add( label, strWin3 ); items.clear(); items << i18n("Activate, Raise & Pass Click") @@ -648,42 +648,42 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, << i18n("Activate") << i18n("Activate & Raise"); - QComboBox* combo = new QComboBox(grid); + TQComboBox* combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, SIGNAL(activated(int)), SLOT(changed())); + connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); coWin1 = combo; - QWhatsThis::add( combo, strWin1 ); + TQWhatsThis::add( combo, strWin1 ); - combo = new QComboBox(grid); + combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, SIGNAL(activated(int)), SLOT(changed())); + connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); coWin2 = combo; - QWhatsThis::add( combo, strWin2 ); + TQWhatsThis::add( combo, strWin2 ); - combo = new QComboBox(grid); + combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, SIGNAL(activated(int)), SLOT(changed())); + connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); coWin3 = combo; - QWhatsThis::add( combo, strWin3 ); + TQWhatsThis::add( combo, strWin3 ); /** Inner window, titlebar and frame **************/ - box = new QVGroupBox(i18n("Inner Window, Titlebar && Frame"), this, "Inner Window, Titlebar and Frame"); + box = new TQVGroupBox(i18n("Inner Window, Titlebar && Frame"), this, "Inner Window, Titlebar and Frame"); box->layout()->setMargin(KDialog::marginHint()); box->layout()->setSpacing(KDialog::spacingHint()); layout->addWidget(box); - QWhatsThis::add( box, i18n("Here you can customize KDE's behavior when clicking somewhere into" + TQWhatsThis::add( box, i18n("Here you can customize KDE's behavior when clicking somewhere into" " a window while pressing a modifier key.")); - grid = new QGrid(5, Qt::Vertical, box); + grid = new TQGrid(5, Qt::Vertical, box); // Labels - label = new QLabel(i18n("Modifier key:"), grid); + label = new TQLabel(i18n("Modifier key:"), grid); strAllKey = i18n("Here you select whether holding the Meta key or Alt key " "will allow you to perform the following actions."); - QWhatsThis::add( label, strAllKey ); + TQWhatsThis::add( label, strAllKey ); strMouseButton1 = i18n("Modifier key + left button:"); @@ -700,29 +700,29 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, qSwap(strAll1, strAll3); } - label = new QLabel(strMouseButton1, grid); - QWhatsThis::add( label, strAll1); + label = new TQLabel(strMouseButton1, grid); + TQWhatsThis::add( label, strAll1); - label = new QLabel(i18n("Modifier key + middle button:"), grid); + label = new TQLabel(i18n("Modifier key + middle button:"), grid); strAll2 = i18n("Here you can customize KDE's behavior when middle clicking into a window" " while pressing the modifier key."); - QWhatsThis::add( label, strAll2 ); + TQWhatsThis::add( label, strAll2 ); - label = new QLabel(strMouseButton3, grid); - QWhatsThis::add( label, strAll3); + label = new TQLabel(strMouseButton3, grid); + TQWhatsThis::add( label, strAll3); - label = new QLabel(i18n("Modifier key + mouse wheel:"), grid); + label = new TQLabel(i18n("Modifier key + mouse wheel:"), grid); strAllW = i18n("Here you can customize KDE's behavior when scrolling with the mouse wheel" " in a window while pressing the modifier key."); - QWhatsThis::add( label, strAllW); + TQWhatsThis::add( label, strAllW); // Combo's - combo = new QComboBox(grid); + combo = new TQComboBox(grid); combo->insertItem(i18n("Meta")); combo->insertItem(i18n("Alt")); - connect(combo, SIGNAL(activated(int)), SLOT(changed())); + connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); coAllKey = combo; - QWhatsThis::add( combo, strAllKey ); + TQWhatsThis::add( combo, strAllKey ); items.clear(); items << i18n("Move") @@ -734,25 +734,25 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, << i18n("Minimize") << i18n("Nothing"); - combo = new QComboBox(grid); + combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, SIGNAL(activated(int)), SLOT(changed())); + connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); coAll1 = combo; - QWhatsThis::add( combo, strAll1 ); + TQWhatsThis::add( combo, strAll1 ); - combo = new QComboBox(grid); + combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, SIGNAL(activated(int)), SLOT(changed())); + connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); coAll2 = combo; - QWhatsThis::add( combo, strAll2 ); + TQWhatsThis::add( combo, strAll2 ); - combo = new QComboBox(grid); + combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, SIGNAL(activated(int)), SLOT(changed())); + connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); coAll3 = combo; - QWhatsThis::add( combo, strAll3 ); + TQWhatsThis::add( combo, strAll3 ); - combo = new QComboBox(grid); + combo = new TQComboBox(grid); combo->insertItem(i18n("Raise/Lower")); combo->insertItem(i18n("Shade/Unshade")); combo->insertItem(i18n("Maximize/Restore")); @@ -760,9 +760,9 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, combo->insertItem(i18n("Move to Previous/Next Desktop")); combo->insertItem(i18n("Change Opacity")); combo->insertItem(i18n("Nothing")); - connect(combo, SIGNAL(activated(int)), SLOT(changed())); + connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); coAllW = combo; - QWhatsThis::add( combo, strAllW ); + TQWhatsThis::add( combo, strAllW ); layout->addStretch(); @@ -775,7 +775,7 @@ KWindowActionsConfig::~KWindowActionsConfig() delete config; } -void KWindowActionsConfig::setComboText( QComboBox* combo, const char*txt ) +void KWindowActionsConfig::setComboText( TQComboBox* combo, const char*txt ) { if( combo == coWin1 || combo == coWin2 || combo == coWin3 ) combo->setCurrentItem( tbl_txt_lookup( tbl_Win, txt )); diff --git a/kwin/kcmkwin/kwinoptions/mouse.h b/kwin/kcmkwin/kwinoptions/mouse.h index 24b2d4030..b28437511 100644 --- a/kwin/kcmkwin/kwinoptions/mouse.h +++ b/kwin/kcmkwin/kwinoptions/mouse.h @@ -24,10 +24,10 @@ class KConfig; -#include <qwidget.h> +#include <tqwidget.h> #include <kcmodule.h> -#include <qcombobox.h> -#include <qtooltip.h> +#include <tqcombobox.h> +#include <tqtooltip.h> class ToolTipComboBox: public QComboBox @@ -35,12 +35,12 @@ class ToolTipComboBox: public QComboBox Q_OBJECT public: - ToolTipComboBox(QWidget * owner, char const * const * toolTips_) - : QComboBox(owner) + ToolTipComboBox(TQWidget * owner, char const * const * toolTips_) + : TQComboBox(owner) , toolTips(toolTips_) {} public slots: - void changed() {QToolTip::add( this, i18n(toolTips[currentItem()]) );} + void changed() {TQToolTip::add( this, i18n(toolTips[currentItem()]) );} protected: char const * const * toolTips; @@ -54,7 +54,7 @@ class KTitleBarActionsConfig : public KCModule public: - KTitleBarActionsConfig( bool _standAlone, KConfig *_config, QWidget *parent=0, const char* name=0 ); + KTitleBarActionsConfig( bool _standAlone, KConfig *_config, TQWidget *parent=0, const char* name=0 ); ~KTitleBarActionsConfig( ); void load(); @@ -65,15 +65,15 @@ public slots: void changed() { emit KCModule::changed(true); } private: - QComboBox* coTiDbl; + TQComboBox* coTiDbl; - QComboBox* coTiAct1; - QComboBox* coTiAct2; - QComboBox* coTiAct3; - QComboBox* coTiAct4; - QComboBox* coTiInAct1; - QComboBox* coTiInAct2; - QComboBox* coTiInAct3; + TQComboBox* coTiAct1; + TQComboBox* coTiAct2; + TQComboBox* coTiAct3; + TQComboBox* coTiAct4; + TQComboBox* coTiInAct1; + TQComboBox* coTiInAct2; + TQComboBox* coTiInAct3; ToolTipComboBox * coMax[3]; @@ -86,7 +86,7 @@ private: const char* functionTiInAc(int); const char* functionMax(int); - void setComboText(QComboBox* combo, const char* text); + void setComboText(TQComboBox* combo, const char* text); const char* fixup( const char* s ); private slots: @@ -100,7 +100,7 @@ class KWindowActionsConfig : public KCModule public: - KWindowActionsConfig( bool _standAlone, KConfig *_config, QWidget *parent=0, const char* name=0 ); + KWindowActionsConfig( bool _standAlone, KConfig *_config, TQWidget *parent=0, const char* name=0 ); ~KWindowActionsConfig( ); void load(); @@ -111,15 +111,15 @@ public slots: void changed() { emit KCModule::changed(true); } private: - QComboBox* coWin1; - QComboBox* coWin2; - QComboBox* coWin3; + TQComboBox* coWin1; + TQComboBox* coWin2; + TQComboBox* coWin3; - QComboBox* coAllKey; - QComboBox* coAll1; - QComboBox* coAll2; - QComboBox* coAll3; - QComboBox* coAllW; + TQComboBox* coAllKey; + TQComboBox* coAll1; + TQComboBox* coAll2; + TQComboBox* coAll3; + TQComboBox* coAllW; KConfig *config; bool standAlone; @@ -129,7 +129,7 @@ private: const char* functionAll(int); const char* functionAllW(int); - void setComboText(QComboBox* combo, const char* text); + void setComboText(TQComboBox* combo, const char* text); const char* fixup( const char* s ); }; diff --git a/kwin/kcmkwin/kwinoptions/windows.cpp b/kwin/kcmkwin/kwinoptions/windows.cpp index aa779125b..1a9e88f15 100644 --- a/kwin/kcmkwin/kwinoptions/windows.cpp +++ b/kwin/kcmkwin/kwinoptions/windows.cpp @@ -23,15 +23,15 @@ #include <config.h> -#include <qdir.h> -#include <qlayout.h> -#include <qslider.h> -#include <qwhatsthis.h> -#include <qvbuttongroup.h> -#include <qcheckbox.h> -#include <qradiobutton.h> -#include <qlabel.h> -#include <qcombobox.h> +#include <tqdir.h> +#include <tqlayout.h> +#include <tqslider.h> +#include <tqwhatsthis.h> +#include <tqvbuttongroup.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> +#include <tqlabel.h> +#include <tqcombobox.h> #include <kmessagebox.h> #include <kactivelabel.h> @@ -44,7 +44,7 @@ #include <dcopclient.h> #include <kglobal.h> #include <kprocess.h> -#include <qtabwidget.h> +#include <tqtabwidget.h> #include <X11/X.h> #include <X11/Xlib.h> @@ -101,19 +101,19 @@ KFocusConfig::~KFocusConfig () } // removed the LCD display over the slider - this is not good GUI design :) RNolden 051701 -KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, QWidget * parent, const char *) +KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * parent, const char *) : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) { - QString wtstr; - QBoxLayout *lay = new QVBoxLayout (this, 0, KDialog::spacingHint()); + TQString wtstr; + TQBoxLayout *lay = new TQVBoxLayout (this, 0, KDialog::spacingHint()); - //iTLabel = new QLabel(i18n(" Allowed overlap:\n" + //iTLabel = new TQLabel(i18n(" Allowed overlap:\n" // "(% of desktop space)"), // plcBox); //iTLabel->setAlignment(AlignTop|AlignHCenter); //pLay->addWidget(iTLabel,1,1); - //interactiveTrigger = new QSpinBox(0, 500, 1, plcBox); + //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox); //pLay->addWidget(interactiveTrigger,1,2); //pLay->addRowSpacing(2,KDialog::spacingHint()); @@ -121,16 +121,16 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, QWidget * parent //lay->addWidget(plcBox); // focus policy - fcsBox = new QButtonGroup(i18n("Focus"),this); + fcsBox = new TQButtonGroup(i18n("Focus"),this); fcsBox->setColumnLayout( 0, Qt::Horizontal ); - QBoxLayout *fLay = new QVBoxLayout(fcsBox->layout(), + TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->layout(), KDialog::spacingHint()); - QBoxLayout *cLay = new QHBoxLayout(fLay); - QLabel *fLabel = new QLabel(i18n("&Policy:"), fcsBox); + TQBoxLayout *cLay = new TQHBoxLayout(fLay); + TQLabel *fLabel = new TQLabel(i18n("&Policy:"), fcsBox); cLay->addWidget(fLabel, 0); - focusCombo = new QComboBox(false, fcsBox); + focusCombo = new TQComboBox(false, fcsBox); focusCombo->insertItem(i18n("Click to Focus"), CLICK_TO_FOCUS); focusCombo->insertItem(i18n("Focus Follows Mouse"), FOCUS_FOLLOWS_MOUSE); focusCombo->insertItem(i18n("Focus Under Mouse"), FOCUS_UNDER_MOUSE); @@ -158,15 +158,15 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, QWidget * parent " features such as the Alt+Tab walk through windows dialog in the KDE mode" " from working properly." ); - QWhatsThis::add( focusCombo, wtstr); - QWhatsThis::add(fLabel, wtstr); + TQWhatsThis::add( focusCombo, wtstr); + TQWhatsThis::add(fLabel, wtstr); - connect(focusCombo, SIGNAL(activated(int)), this, SLOT(setAutoRaiseEnabled()) ); + connect(focusCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setAutoRaiseEnabled()) ); // autoraise delay - autoRaiseOn = new QCheckBox(i18n("Auto &raise"), fcsBox); + autoRaiseOn = new TQCheckBox(i18n("Auto &raise"), fcsBox); fLay->addWidget(autoRaiseOn); - connect(autoRaiseOn,SIGNAL(toggled(bool)), this, SLOT(autoRaiseOnTog(bool))); + connect(autoRaiseOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(autoRaiseOnTog(bool))); autoRaise = new KIntNumInput(500, fcsBox); autoRaise->setLabel(i18n("Dela&y:"), Qt::AlignVCenter|Qt::AlignLeft); @@ -175,11 +175,11 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, QWidget * parent autoRaise->setSuffix(i18n(" msec")); fLay->addWidget(autoRaise); - connect(focusCombo, SIGNAL(activated(int)), this, SLOT(setDelayFocusEnabled()) ); + connect(focusCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setDelayFocusEnabled()) ); - delayFocusOn = new QCheckBox(i18n("Delay focus"), fcsBox); + delayFocusOn = new TQCheckBox(i18n("Delay focus"), fcsBox); fLay->addWidget(delayFocusOn); - connect(delayFocusOn,SIGNAL(toggled(bool)), this, SLOT(delayFocusOnTog(bool))); + connect(delayFocusOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(delayFocusOnTog(bool))); delayFocus = new KIntNumInput(500, fcsBox); delayFocus->setLabel(i18n("Dela&y:"), Qt::AlignVCenter|Qt::AlignLeft); @@ -188,45 +188,45 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, QWidget * parent delayFocus->setSuffix(i18n(" msec")); fLay->addWidget(delayFocus); - clickRaiseOn = new QCheckBox(i18n("C&lick raise active window"), fcsBox); - connect(clickRaiseOn,SIGNAL(toggled(bool)), this, SLOT(clickRaiseOnTog(bool))); + clickRaiseOn = new TQCheckBox(i18n("C&lick raise active window"), fcsBox); + connect(clickRaiseOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(clickRaiseOnTog(bool))); fLay->addWidget(clickRaiseOn); // fLay->addColSpacing(0,QMAX(autoRaiseOn->sizeHint().width(), // clickRaiseOn->sizeHint().width()) + 15); - QWhatsThis::add( autoRaiseOn, i18n("When this option is enabled, a window in the background will automatically" + 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.") ); wtstr = i18n("This is the delay after which the window that the mouse pointer is over will automatically" " come to the front."); - QWhatsThis::add( autoRaise, wtstr ); + TQWhatsThis::add( autoRaise, wtstr ); - QWhatsThis::add( clickRaiseOn, i18n("When this option is enabled, the active window will be brought to the" + TQWhatsThis::add( clickRaiseOn, i18n("When this option is enabled, the active window will be brought to the" " front when you click somewhere into the window contents. To change" " it for inactive windows, you need to change the settings" " in the Actions tab.") ); - QWhatsThis::add( delayFocusOn, i18n("When this option is enabled, there will be a delay after which the" + TQWhatsThis::add( delayFocusOn, i18n("When this option is enabled, there will be a delay after which the" " window the mouse pointer is over will become active (receive focus).") ); - QWhatsThis::add( delayFocus, i18n("This is the delay after which the window the mouse pointer is over" + TQWhatsThis::add( delayFocus, i18n("This is the delay after which the window the mouse pointer is over" " will automatically receive focus.") ); - separateScreenFocus = new QCheckBox( i18n( "S&eparate screen focus" ), fcsBox ); + separateScreenFocus = new TQCheckBox( i18n( "S&eparate screen focus" ), fcsBox ); fLay->addWidget( separateScreenFocus ); wtstr = i18n( "When this option is enabled, focus operations are limited only to the active Xinerama screen" ); - QWhatsThis::add( separateScreenFocus, wtstr ); + TQWhatsThis::add( separateScreenFocus, wtstr ); - activeMouseScreen = new QCheckBox( i18n( "Active &mouse screen" ), fcsBox ); + activeMouseScreen = new TQCheckBox( i18n( "Active &mouse screen" ), fcsBox ); fLay->addWidget( activeMouseScreen ); wtstr = i18n( "When this option is enabled, active Xinerama screen (where for example new windows appear)" " is the screen with the mouse pointer. When disabled, the active Xinerama screen is the screen" " with the focused window. This option is by default disabled for Click to focus and" " enabled for other focus policies." ); - QWhatsThis::add( activeMouseScreen, wtstr ); - connect(focusCombo, SIGNAL(activated(int)), this, SLOT(updateActiveMouseScreen())); + TQWhatsThis::add( activeMouseScreen, wtstr ); + connect(focusCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateActiveMouseScreen())); - if (!QApplication::desktop()->isVirtualDesktop() || - QApplication::desktop()->numScreens() == 1) // No Ximerama + if (!TQApplication::desktop()->isVirtualDesktop() || + TQApplication::desktop()->numScreens() == 1) // No Ximerama { separateScreenFocus->hide(); activeMouseScreen->hide(); @@ -234,11 +234,11 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, QWidget * parent lay->addWidget(fcsBox); - kbdBox = new QButtonGroup(i18n("Navigation"), this); + kbdBox = new TQButtonGroup(i18n("Navigation"), this); kbdBox->setColumnLayout( 0, Qt::Horizontal ); - QVBoxLayout *kLay = new QVBoxLayout(kbdBox->layout(), KDialog::spacingHint()); + TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->layout(), KDialog::spacingHint()); - altTabPopup = new QCheckBox( i18n("Show window list while switching windows"), kbdBox ); + altTabPopup = new TQCheckBox( i18n("Show window list while switching windows"), kbdBox ); kLay->addWidget( altTabPopup ); wtstr = i18n("Hold down the Alt key and press the Tab key repeatedly to walk" @@ -250,45 +250,45 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, QWidget * parent "Otherwise, the focus is passed to a new window each time Tab" " is pressed, with no popup widget. In addition, the previously" " activated window will be sent to the back in this mode."); - QWhatsThis::add( altTabPopup, wtstr ); - connect(focusCombo, SIGNAL(activated(int)), this, SLOT(updateAltTabMode())); + TQWhatsThis::add( altTabPopup, wtstr ); + connect(focusCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateAltTabMode())); - traverseAll = new QCheckBox( i18n( "&Traverse windows on all desktops" ), kbdBox ); + traverseAll = new TQCheckBox( i18n( "&Traverse windows on all desktops" ), kbdBox ); kLay->addWidget( traverseAll ); wtstr = i18n( "Leave this option disabled if you want to limit walking through" " windows to the current desktop." ); - QWhatsThis::add( traverseAll, wtstr ); + TQWhatsThis::add( traverseAll, wtstr ); - rollOverDesktops = new QCheckBox( i18n("Desktop navi&gation wraps around"), kbdBox ); + rollOverDesktops = new TQCheckBox( i18n("Desktop navi&gation wraps around"), kbdBox ); kLay->addWidget(rollOverDesktops); wtstr = i18n( "Enable this option if you want keyboard or active desktop border navigation beyond" " the edge of a desktop to take you to the opposite edge of the new desktop." ); - QWhatsThis::add( rollOverDesktops, wtstr ); + TQWhatsThis::add( rollOverDesktops, wtstr ); - showPopupinfo = new QCheckBox( i18n("Popup desktop name on desktop &switch"), kbdBox ); + showPopupinfo = new TQCheckBox( i18n("Popup desktop name on desktop &switch"), kbdBox ); kLay->addWidget(showPopupinfo); wtstr = i18n( "Enable this option if you wish to see the current desktop" " name popup whenever the current desktop is changed." ); - QWhatsThis::add( showPopupinfo, wtstr ); + TQWhatsThis::add( showPopupinfo, wtstr ); lay->addWidget(kbdBox); lay->addStretch(); // Any changes goes to slotChanged() - connect(focusCombo, SIGNAL(activated(int)), SLOT(changed())); - connect(fcsBox, SIGNAL(clicked(int)), SLOT(changed())); - connect(autoRaise, SIGNAL(valueChanged(int)), SLOT(changed())); - connect(delayFocus, SIGNAL(valueChanged(int)), SLOT(changed())); - connect(separateScreenFocus, SIGNAL(clicked()), SLOT(changed())); - connect(activeMouseScreen, SIGNAL(clicked()), SLOT(changed())); - connect(altTabPopup, SIGNAL(clicked()), SLOT(changed())); - connect(traverseAll, SIGNAL(clicked()), SLOT(changed())); - connect(rollOverDesktops, SIGNAL(clicked()), SLOT(changed())); - connect(showPopupinfo, SIGNAL(clicked()), SLOT(changed())); + connect(focusCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(fcsBox, TQT_SIGNAL(clicked(int)), TQT_SLOT(changed())); + connect(autoRaise, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(delayFocus, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(separateScreenFocus, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); + connect(activeMouseScreen, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); + connect(altTabPopup, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); + connect(traverseAll, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); + connect(rollOverDesktops, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); + connect(showPopupinfo, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); load(); } @@ -425,7 +425,7 @@ void KFocusConfig::setShowPopupinfo(bool a) { void KFocusConfig::load( void ) { - QString key; + TQString key; config->setGroup( "Windows" ); @@ -564,34 +564,34 @@ KAdvancedConfig::~KAdvancedConfig () delete config; } -KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, QWidget *parent, const char *) +KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, TQWidget *parent, const char *) : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) { - QString wtstr; - QBoxLayout *lay = new QVBoxLayout (this, 0, KDialog::spacingHint()); + TQString wtstr; + TQBoxLayout *lay = new TQVBoxLayout (this, 0, KDialog::spacingHint()); - //iTLabel = new QLabel(i18n(" Allowed overlap:\n" + //iTLabel = new TQLabel(i18n(" Allowed overlap:\n" // "(% of desktop space)"), // plcBox); //iTLabel->setAlignment(AlignTop|AlignHCenter); //pLay->addWidget(iTLabel,1,1); - //interactiveTrigger = new QSpinBox(0, 500, 1, plcBox); + //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox); //pLay->addWidget(interactiveTrigger,1,2); //pLay->addRowSpacing(2,KDialog::spacingHint()); //lay->addWidget(plcBox); - shBox = new QVButtonGroup(i18n("Shading"), this); + shBox = new TQVButtonGroup(i18n("Shading"), this); - animateShade = new QCheckBox(i18n("Anima&te"), shBox); - QWhatsThis::add(animateShade, i18n("Animate the action of reducing the window to its titlebar (shading)" + animateShade = new TQCheckBox(i18n("Anima&te"), shBox); + TQWhatsThis::add(animateShade, i18n("Animate the action of reducing the window to its titlebar (shading)" " as well as the expansion of a shaded window") ); - shadeHoverOn = new QCheckBox(i18n("&Enable hover"), shBox); + shadeHoverOn = new TQCheckBox(i18n("&Enable hover"), shBox); - connect(shadeHoverOn, SIGNAL(toggled(bool)), this, SLOT(shadeHoverChanged(bool))); + connect(shadeHoverOn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(shadeHoverChanged(bool))); shadeHover = new KIntNumInput(500, shBox); shadeHover->setLabel(i18n("Dela&y:"), Qt::AlignVCenter|Qt::AlignLeft); @@ -599,49 +599,49 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, QWidget *p shadeHover->setSteps(100, 100); shadeHover->setSuffix(i18n(" msec")); - QWhatsThis::add(shadeHoverOn, i18n("If Shade Hover is enabled, a shaded window will un-shade automatically " + TQWhatsThis::add(shadeHoverOn, i18n("If Shade Hover is enabled, a shaded window will un-shade automatically " "when the mouse pointer has been over the title bar for some time.")); wtstr = i18n("Sets the time in milliseconds before the window unshades " "when the mouse pointer goes over the shaded window."); - QWhatsThis::add(shadeHover, wtstr); + TQWhatsThis::add(shadeHover, wtstr); lay->addWidget(shBox); // Any changes goes to slotChanged() - connect(animateShade, SIGNAL(toggled(bool)), SLOT(changed())); - connect(shadeHoverOn, SIGNAL(toggled(bool)), SLOT(changed())); - connect(shadeHover, SIGNAL(valueChanged(int)), SLOT(changed())); + connect(animateShade, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(shadeHoverOn, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(shadeHover, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - electricBox = new QVButtonGroup(i18n("Active Desktop Borders"), this); + electricBox = new TQVButtonGroup(i18n("Active Desktop Borders"), this); electricBox->setMargin(15); - QWhatsThis::add( electricBox, i18n("If this option is enabled, moving the mouse to a screen border" + TQWhatsThis::add( electricBox, i18n("If this option is enabled, moving the mouse to a screen border" " will change your desktop. This is e.g. useful if you want to drag windows from one desktop" " to the other.") ); - active_disable = new QRadioButton(i18n("D&isabled"), electricBox); - active_move = new QRadioButton(i18n("Only &when moving windows"), electricBox); - active_always = new QRadioButton(i18n("A&lways enabled"), electricBox); + active_disable = new TQRadioButton(i18n("D&isabled"), electricBox); + active_move = new TQRadioButton(i18n("Only &when moving windows"), electricBox); + active_always = new TQRadioButton(i18n("A&lways enabled"), electricBox); delays = new KIntNumInput(10, electricBox); delays->setRange(0, MAX_EDGE_RES, 50, true); delays->setSuffix(i18n(" msec")); delays->setLabel(i18n("Desktop &switch delay:")); - QWhatsThis::add( delays, i18n("Here you can set a delay for switching desktops using the active" + TQWhatsThis::add( delays, i18n("Here you can set a delay for switching desktops using the active" " borders feature. Desktops will be switched after the mouse has been pushed against a screen border" " for the specified number of milliseconds.") ); - connect( electricBox, SIGNAL(clicked(int)), this, SLOT(setEBorders())); + connect( electricBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(setEBorders())); // Any changes goes to slotChanged() - connect(electricBox, SIGNAL(clicked(int)), SLOT(changed())); - connect(delays, SIGNAL(valueChanged(int)), SLOT(changed())); + connect(electricBox, TQT_SIGNAL(clicked(int)), TQT_SLOT(changed())); + connect(delays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); lay->addWidget(electricBox); - QHBoxLayout* focusStealingLayout = new QHBoxLayout( lay,KDialog::spacingHint()); - QLabel* focusStealingLabel = new QLabel( i18n( "Focus stealing prevention level:" ), this ); - focusStealing = new QComboBox( this ); + TQHBoxLayout* focusStealingLayout = new TQHBoxLayout( lay,KDialog::spacingHint()); + TQLabel* focusStealingLabel = new TQLabel( i18n( "Focus stealing prevention level:" ), this ); + focusStealing = new TQComboBox( this ); focusStealing->insertItem( i18n( "Focus Stealing Prevention Level", "None" )); focusStealing->insertItem( i18n( "Focus Stealing Prevention Level", "Low" )); focusStealing->insertItem( i18n( "Focus Stealing Prevention Level", "Normal" )); @@ -669,16 +669,16 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, QWidget *p "<p>Windows that are prevented from stealing focus are marked as demanding attention, " "which by default means their taskbar entry will be highlighted. This can be changed " "in the Notifications control module.</p>" ); - QWhatsThis::add( focusStealing, wtstr ); - QWhatsThis::add( focusStealingLabel, wtstr ); - connect(focusStealing, SIGNAL(activated(int)), SLOT(changed())); + TQWhatsThis::add( focusStealing, wtstr ); + TQWhatsThis::add( focusStealingLabel, wtstr ); + connect(focusStealing, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); - hideUtilityWindowsForInactive = new QCheckBox( i18n( "Hide utility windows for inactive applications" ), this ); - QWhatsThis::add( hideUtilityWindowsForInactive, + hideUtilityWindowsForInactive = new TQCheckBox( i18n( "Hide utility windows for inactive applications" ), this ); + TQWhatsThis::add( hideUtilityWindowsForInactive, i18n( "When turned on, utility windows (tool windows, torn-off menus,...) of inactive applications will be" " hidden and will be shown only when the application becomes active. Note that applications" " have to mark the windows with the proper window type for this feature to work." )); - connect(hideUtilityWindowsForInactive, SIGNAL(toggled(bool)), SLOT(changed())); + connect(hideUtilityWindowsForInactive, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); lay->addWidget( hideUtilityWindowsForInactive ); lay->addStretch(); @@ -822,85 +822,85 @@ KMovingConfig::~KMovingConfig () delete config; } -KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, QWidget *parent, const char *) +KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *parent, const char *) : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) { - QString wtstr; - QBoxLayout *lay = new QVBoxLayout (this, 0, KDialog::spacingHint()); + TQString wtstr; + TQBoxLayout *lay = new TQVBoxLayout (this, 0, KDialog::spacingHint()); - windowsBox = new QButtonGroup(i18n("Windows"), this); + windowsBox = new TQButtonGroup(i18n("Windows"), this); windowsBox->setColumnLayout( 0, Qt::Horizontal ); - QBoxLayout *wLay = new QVBoxLayout (windowsBox->layout(), KDialog::spacingHint()); + TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->layout(), KDialog::spacingHint()); - QBoxLayout *bLay = new QVBoxLayout; + TQBoxLayout *bLay = new QVBoxLayout; wLay->addLayout(bLay); - opaque = new QCheckBox(i18n("Di&splay content in moving windows"), windowsBox); + opaque = new TQCheckBox(i18n("Di&splay content in moving windows"), windowsBox); bLay->addWidget(opaque); - QWhatsThis::add( opaque, i18n("Enable this option if you want a window's content to be fully shown" + TQWhatsThis::add( opaque, i18n("Enable this option if you want a window's content to be fully shown" " while moving it, instead of just showing a window 'skeleton'. The result may not be satisfying" " on slow machines without graphic acceleration.") ); - resizeOpaqueOn = new QCheckBox(i18n("Display content in &resizing windows"), windowsBox); + resizeOpaqueOn = new TQCheckBox(i18n("Display content in &resizing windows"), windowsBox); bLay->addWidget(resizeOpaqueOn); - QWhatsThis::add( resizeOpaqueOn, i18n("Enable this option if you want a window's content to be shown" + TQWhatsThis::add( resizeOpaqueOn, i18n("Enable this option if you want a window's content to be shown" " while resizing it, instead of just showing a window 'skeleton'. The result may not be satisfying" " on slow machines.") ); - geometryTipOn = new QCheckBox(i18n("Display window &geometry when moving or resizing"), windowsBox); + geometryTipOn = new TQCheckBox(i18n("Display window &geometry when moving or resizing"), windowsBox); bLay->addWidget(geometryTipOn); - QWhatsThis::add(geometryTipOn, i18n("Enable this option if you want a window's geometry to be displayed" + 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.")); - QGridLayout *rLay = new QGridLayout(2,3); + TQGridLayout *rLay = new TQGridLayout(2,3); bLay->addLayout(rLay); rLay->setColStretch(0,0); rLay->setColStretch(1,1); - minimizeAnimOn = new QCheckBox(i18n("Animate minimi&ze and restore"), + minimizeAnimOn = new TQCheckBox(i18n("Animate minimi&ze and restore"), windowsBox); - QWhatsThis::add( minimizeAnimOn, i18n("Enable this option if you want an animation shown when" + TQWhatsThis::add( minimizeAnimOn, i18n("Enable this option if you want an animation shown when" " windows are minimized or restored." ) ); rLay->addWidget(minimizeAnimOn,0,0); - minimizeAnimSlider = new QSlider(0,10,10,0,QSlider::Horizontal, windowsBox); + minimizeAnimSlider = new TQSlider(0,10,10,0,TQSlider::Horizontal, windowsBox); minimizeAnimSlider->setSteps(1, 1); - // QSlider::Below clashes with a X11/X.h #define + // TQSlider::Below clashes with a X11/X.h #define #undef Below - minimizeAnimSlider->setTickmarks(QSlider::Below); + minimizeAnimSlider->setTickmarks(TQSlider::Below); rLay->addMultiCellWidget(minimizeAnimSlider,0,0,1,2); - connect(minimizeAnimOn, SIGNAL(toggled(bool)), this, SLOT(setMinimizeAnim(bool))); - connect(minimizeAnimSlider, SIGNAL(valueChanged(int)), this, SLOT(setMinimizeAnimSpeed(int))); + connect(minimizeAnimOn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setMinimizeAnim(bool))); + connect(minimizeAnimSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setMinimizeAnimSpeed(int))); - minimizeAnimSlowLabel= new QLabel(i18n("Slow"),windowsBox); + minimizeAnimSlowLabel= new TQLabel(i18n("Slow"),windowsBox); minimizeAnimSlowLabel->setAlignment(Qt::AlignTop|Qt::AlignLeft); rLay->addWidget(minimizeAnimSlowLabel,1,1); - minimizeAnimFastLabel= new QLabel(i18n("Fast"),windowsBox); + minimizeAnimFastLabel= new TQLabel(i18n("Fast"),windowsBox); 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" " minimized and restored. "); - QWhatsThis::add( minimizeAnimSlider, wtstr ); - QWhatsThis::add( minimizeAnimSlowLabel, wtstr ); - QWhatsThis::add( minimizeAnimFastLabel, wtstr ); + TQWhatsThis::add( minimizeAnimSlider, wtstr ); + TQWhatsThis::add( minimizeAnimSlowLabel, wtstr ); + TQWhatsThis::add( minimizeAnimFastLabel, wtstr ); - moveResizeMaximized = new QCheckBox( i18n("Allow moving and resizing o&f maximized windows"), windowsBox); + moveResizeMaximized = new TQCheckBox( i18n("Allow moving and resizing o&f maximized windows"), windowsBox); bLay->addWidget(moveResizeMaximized); - QWhatsThis::add(moveResizeMaximized, i18n("When enabled, this feature activates the border of maximized windows" + TQWhatsThis::add(moveResizeMaximized, i18n("When enabled, this feature activates the border of maximized windows" " and allows you to move or resize them," " just like for normal windows")); - QBoxLayout *vLay = new QHBoxLayout(bLay); + TQBoxLayout *vLay = new TQHBoxLayout(bLay); - QLabel *plcLabel = new QLabel(i18n("&Placement:"),windowsBox); + TQLabel *plcLabel = new TQLabel(i18n("&Placement:"),windowsBox); - placementCombo = new QComboBox(false, windowsBox); + placementCombo = new TQComboBox(false, windowsBox); placementCombo->insertItem(i18n("Smart"), SMART_PLACEMENT); placementCombo->insertItem(i18n("Maximizing"), MAXIMIZING_PLACEMENT); placementCombo->insertItem(i18n("Cascade"), CASCADE_PLACEMENT); @@ -926,8 +926,8 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, QWidget *paren " <li><em>Zero-Cornered</em> will place the window in the top-left corner</li>" "</ul>") ; - QWhatsThis::add( plcLabel, wtstr); - QWhatsThis::add( placementCombo, wtstr); + TQWhatsThis::add( plcLabel, wtstr); + TQWhatsThis::add( placementCombo, wtstr); plcLabel->setBuddy(placementCombo); vLay->addWidget(plcLabel, 0); @@ -937,13 +937,13 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, QWidget *paren lay->addWidget(windowsBox); - //iTLabel = new QLabel(i18n(" Allowed overlap:\n" + //iTLabel = new TQLabel(i18n(" Allowed overlap:\n" // "(% of desktop space)"), // plcBox); //iTLabel->setAlignment(AlignTop|AlignHCenter); //pLay->addWidget(iTLabel,1,1); - //interactiveTrigger = new QSpinBox(0, 500, 1, plcBox); + //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox); //pLay->addWidget(interactiveTrigger,1,2); //pLay->addRowSpacing(2,KDialog::spacingHint()); @@ -952,7 +952,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, QWidget *paren //CT 15mar98 - add EdgeResistance, BorderAttractor, WindowsAttractor config - MagicBox = new QVButtonGroup(i18n("Snap Zones"), this); + MagicBox = new TQVButtonGroup(i18n("Snap Zones"), this); MagicBox->setMargin(15); BrdrSnap = new KIntNumInput(10, MagicBox); @@ -960,7 +960,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, QWidget *paren BrdrSnap->setRange( 0, MAX_BRDR_SNAP); BrdrSnap->setLabel(i18n("&Border snap zone:")); BrdrSnap->setSteps(1,10); - QWhatsThis::add( BrdrSnap, i18n("Here you can set the snap zone for screen borders, i.e." + TQWhatsThis::add( BrdrSnap, i18n("Here you can set the snap zone for screen borders, i.e." " the 'strength' of the magnetic field which will make windows snap to the border when" " moved near it.") ); @@ -969,12 +969,12 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, QWidget *paren WndwSnap->setRange( 0, MAX_WNDW_SNAP); WndwSnap->setLabel(i18n("&Window snap zone:")); BrdrSnap->setSteps(1,10); - QWhatsThis::add( WndwSnap, i18n("Here you can set the snap zone for windows, i.e." + TQWhatsThis::add( WndwSnap, i18n("Here you can set the snap zone for windows, i.e." " the 'strength' of the magnetic field which will make windows snap to each other when" " they're moved near another window.") ); - OverlapSnap=new QCheckBox(i18n("Snap windows onl&y when overlapping"),MagicBox); - QWhatsThis::add( OverlapSnap, i18n("Here you can set that windows will be only" + OverlapSnap=new TQCheckBox(i18n("Snap windows onl&y when overlapping"),MagicBox); + TQWhatsThis::add( OverlapSnap, i18n("Here you can set that windows will be only" " snapped if you try to overlap them, i.e. they will not be snapped if the windows" " comes only near another window or border.") ); @@ -984,18 +984,18 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, QWidget *paren load(); // Any changes goes to slotChanged() - connect( opaque, SIGNAL(clicked()), SLOT(changed())); - connect( resizeOpaqueOn, SIGNAL(clicked()), SLOT(changed())); - connect( geometryTipOn, SIGNAL(clicked()), SLOT(changed())); - connect( minimizeAnimOn, SIGNAL(clicked() ), SLOT(changed())); - connect( minimizeAnimSlider, SIGNAL(valueChanged(int)), SLOT(changed())); - connect( moveResizeMaximized, SIGNAL(toggled(bool)), SLOT(changed())); - connect( placementCombo, SIGNAL(activated(int)), SLOT(changed())); - connect( BrdrSnap, SIGNAL(valueChanged(int)), SLOT(changed())); - connect( BrdrSnap, SIGNAL(valueChanged(int)), SLOT(slotBrdrSnapChanged(int))); - connect( WndwSnap, SIGNAL(valueChanged(int)), SLOT(changed())); - connect( WndwSnap, SIGNAL(valueChanged(int)), SLOT(slotWndwSnapChanged(int))); - connect( OverlapSnap, SIGNAL(clicked()), SLOT(changed())); + connect( opaque, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); + connect( resizeOpaqueOn, 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())); + connect( placementCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect( BrdrSnap, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect( BrdrSnap, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotBrdrSnapChanged(int))); + connect( WndwSnap, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect( WndwSnap, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotWndwSnapChanged(int))); + connect( OverlapSnap, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); // To get suffix to BrdrSnap and WndwSnap inputs with default values. slotBrdrSnapChanged(BrdrSnap->value()); @@ -1080,7 +1080,7 @@ void KMovingConfig::slotWndwSnapChanged(int value) { void KMovingConfig::load( void ) { - QString key; + TQString key; config->setGroup( "Windows" ); @@ -1192,7 +1192,7 @@ void KMovingConfig::save( void ) // else if (v == MANUAL_PLACEMENT) // config->writeEntry(KWIN_PLACEMENT, "Manual"); // else if (v == INTERACTIVE_PLACEMENT) { -// QString tmpstr = QString("Interactive,%1").arg(interactiveTrigger->value()); +// TQString tmpstr = TQString("Interactive,%1").arg(interactiveTrigger->value()); // config->writeEntry(KWIN_PLACEMENT, tmpstr); // } else @@ -1266,12 +1266,12 @@ KTranslucencyConfig::~KTranslucencyConfig () kompmgr->detach(); } -KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, KConfig *_config, QWidget *parent, const char *) +KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, KConfig *_config, TQWidget *parent, const char *) : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) { kompmgr = 0L; resetKompmgr_ = FALSE; - QVBoxLayout *lay = new QVBoxLayout (this); + TQVBoxLayout *lay = new TQVBoxLayout (this); kompmgrAvailable_ = kompmgrAvailable(); if (!kompmgrAvailable_){ KActiveLabel *label = new KActiveLabel(i18n("<qt><b>It seems that alpha channel support is not available.</b><br><br>" @@ -1289,41 +1289,41 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, KConfig *_config, QW } else { - QTabWidget *tabW = new QTabWidget(this); - QWidget *tGroup = new QWidget(tabW); - QVBoxLayout *vLay = new QVBoxLayout (tGroup,KDialog::marginHint(), KDialog::spacingHint()); + TQTabWidget *tabW = new TQTabWidget(this); + TQWidget *tGroup = new TQWidget(tabW); + TQVBoxLayout *vLay = new TQVBoxLayout (tGroup,KDialog::marginHint(), KDialog::spacingHint()); vLay->addSpacing(11); // to get the proper gb top offset - onlyDecoTranslucent = new QCheckBox(i18n("Apply translucency only to decoration"),tGroup); + onlyDecoTranslucent = new TQCheckBox(i18n("Apply translucency only to decoration"),tGroup); vLay->addWidget(onlyDecoTranslucent); vLay->addSpacing(11); - QGridLayout *gLay = new QGridLayout(vLay,4,2,KDialog::spacingHint()); + TQGridLayout *gLay = new TQGridLayout(vLay,4,2,KDialog::spacingHint()); gLay->setColStretch(1,1); - activeWindowTransparency = new QCheckBox(i18n("Active windows:"),tGroup); + activeWindowTransparency = new TQCheckBox(i18n("Active windows:"),tGroup); gLay->addWidget(activeWindowTransparency,0,0); activeWindowOpacity = new KIntNumInput(100, tGroup); activeWindowOpacity->setRange(0,100); activeWindowOpacity->setSuffix("%"); gLay->addWidget(activeWindowOpacity,0,1); - inactiveWindowTransparency = new QCheckBox(i18n("Inactive windows:"),tGroup); + inactiveWindowTransparency = new TQCheckBox(i18n("Inactive windows:"),tGroup); gLay->addWidget(inactiveWindowTransparency,1,0); inactiveWindowOpacity = new KIntNumInput(100, tGroup); inactiveWindowOpacity->setRange(0,100); inactiveWindowOpacity->setSuffix("%"); gLay->addWidget(inactiveWindowOpacity,1,1); - movingWindowTransparency = new QCheckBox(i18n("Moving windows:"),tGroup); + movingWindowTransparency = new TQCheckBox(i18n("Moving windows:"),tGroup); gLay->addWidget(movingWindowTransparency,2,0); movingWindowOpacity = new KIntNumInput(100, tGroup); movingWindowOpacity->setRange(0,100); movingWindowOpacity->setSuffix("%"); gLay->addWidget(movingWindowOpacity,2,1); - dockWindowTransparency = new QCheckBox(i18n("Dock windows:"),tGroup); + dockWindowTransparency = new TQCheckBox(i18n("Dock windows:"),tGroup); gLay->addWidget(dockWindowTransparency,3,0); dockWindowOpacity = new KIntNumInput(100, tGroup); dockWindowOpacity->setRange(0,100); @@ -1332,80 +1332,80 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, KConfig *_config, QW vLay->addSpacing(11); - keepAboveAsActive = new QCheckBox(i18n("Treat 'keep above' windows as active ones"),tGroup); + keepAboveAsActive = new TQCheckBox(i18n("Treat 'keep above' windows as active ones"),tGroup); vLay->addWidget(keepAboveAsActive); - disableARGB = new QCheckBox(i18n("Disable ARGB windows (ignores window alpha maps, fixes gtk1 apps)"),tGroup); + disableARGB = new TQCheckBox(i18n("Disable ARGB windows (ignores window alpha maps, fixes gtk1 apps)"),tGroup); vLay->addWidget(disableARGB); vLay->addStretch(); tabW->addTab(tGroup, i18n("Opacity")); - QWidget *sGroup = new QWidget(tabW); + TQWidget *sGroup = new TQWidget(tabW); // sGroup->setCheckable(TRUE); - QVBoxLayout *vLay2 = new QVBoxLayout (sGroup,11,6); + TQVBoxLayout *vLay2 = new TQVBoxLayout (sGroup,11,6); vLay2->addSpacing(11); // to get the proper gb top offset - useShadows = new QCheckBox(i18n("Use shadows"),sGroup); + useShadows = new TQCheckBox(i18n("Use shadows"),sGroup); vLay2->addWidget(useShadows); vLay2->addSpacing(11); - QGridLayout *gLay2 = new QGridLayout(vLay2,6,2); + TQGridLayout *gLay2 = new TQGridLayout(vLay2,6,2); gLay2->setColStretch(1,1); - QLabel *label1 = new QLabel(i18n("Active window size:"),sGroup); + TQLabel *label1 = new TQLabel(i18n("Active window size:"),sGroup); gLay2->addWidget(label1,0,0); activeWindowShadowSize = new KIntNumInput(12,sGroup); activeWindowShadowSize->setRange(0,32); // activeWindowShadowSize->setSuffix("px"); gLay2->addWidget(activeWindowShadowSize,0,1); - QLabel *label2 = new QLabel(i18n("Inactive window size:"),sGroup); + TQLabel *label2 = new TQLabel(i18n("Inactive window size:"),sGroup); gLay2->addWidget(label2,1,0); inactiveWindowShadowSize = new KIntNumInput(6,sGroup); inactiveWindowShadowSize->setRange(0,32); // inactiveWindowShadowSize->setSuffix("px"); gLay2->addWidget(inactiveWindowShadowSize,1,1); - QLabel *label3 = new QLabel(i18n("Dock window size:"),sGroup); + TQLabel *label3 = new TQLabel(i18n("Dock window size:"),sGroup); gLay2->addWidget(label3,2,0); dockWindowShadowSize = new KIntNumInput(6,sGroup); dockWindowShadowSize->setRange(0,32); // dockWindowShadowSize->setSuffix("px"); gLay2->addWidget(dockWindowShadowSize,2,1); - QLabel *label4 = new QLabel(i18n("Vertical offset:"),sGroup); + TQLabel *label4 = new TQLabel(i18n("Vertical offset:"),sGroup); gLay2->addWidget(label4,3,0); shadowTopOffset = new KIntNumInput(80,sGroup); shadowTopOffset->setSuffix("%"); shadowTopOffset->setRange(-200,200); gLay2->addWidget(shadowTopOffset,3,1); - QLabel *label5 = new QLabel(i18n("Horizontal offset:"),sGroup); + TQLabel *label5 = new TQLabel(i18n("Horizontal offset:"),sGroup); gLay2->addWidget(label5,4,0); shadowLeftOffset = new KIntNumInput(0,sGroup); shadowLeftOffset->setSuffix("%"); shadowLeftOffset->setRange(-200,200); gLay2->addWidget(shadowLeftOffset,4,1); - QLabel *label6 = new QLabel(i18n("Shadow color:"),sGroup); + TQLabel *label6 = new TQLabel(i18n("Shadow color:"),sGroup); gLay2->addWidget(label6,5,0); shadowColor = new KColorButton(Qt::black,sGroup); gLay2->addWidget(shadowColor,5,1); gLay2->setColStretch(1,1); vLay2->addSpacing(11); - removeShadowsOnMove = new QCheckBox(i18n("Remove shadows on move"),sGroup); + removeShadowsOnMove = new TQCheckBox(i18n("Remove shadows on move"),sGroup); vLay2->addWidget(removeShadowsOnMove); - removeShadowsOnResize = new QCheckBox(i18n("Remove shadows on resize"),sGroup); + removeShadowsOnResize = new TQCheckBox(i18n("Remove shadows on resize"),sGroup); vLay2->addWidget(removeShadowsOnResize); vLay2->addStretch(); tabW->addTab(sGroup, i18n("Shadows")); - QWidget *eGroup = new QWidget(this); - QVBoxLayout *vLay3 = new QVBoxLayout (eGroup,11,6); + TQWidget *eGroup = new TQWidget(this); + TQVBoxLayout *vLay3 = new TQVBoxLayout (eGroup,11,6); - fadeInWindows = new QCheckBox(i18n("Fade-in windows (including popups)"),eGroup); - fadeOnOpacityChange = new QCheckBox(i18n("Fade between opacity changes"),eGroup); + fadeInWindows = new TQCheckBox(i18n("Fade-in windows (including popups)"),eGroup); + fadeOnOpacityChange = new TQCheckBox(i18n("Fade between opacity changes"),eGroup); fadeInSpeed = new KIntNumInput(100, eGroup); fadeInSpeed->setRange(1,100); fadeInSpeed->setLabel(i18n("Fade-in speed:")); @@ -1420,69 +1420,69 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, KConfig *_config, QW tabW->addTab(eGroup, i18n("Effects")); - useTranslucency = new QCheckBox(i18n("Use translucency/shadows"),this); + useTranslucency = new TQCheckBox(i18n("Use translucency/shadows"),this); lay->addWidget(useTranslucency); lay->addWidget(tabW); - connect(useTranslucency, SIGNAL(toggled(bool)), tabW, SLOT(setEnabled(bool))); - - connect(activeWindowTransparency, SIGNAL(toggled(bool)), activeWindowOpacity, SLOT(setEnabled(bool))); - connect(inactiveWindowTransparency, SIGNAL(toggled(bool)), inactiveWindowOpacity, SLOT(setEnabled(bool))); - connect(movingWindowTransparency, SIGNAL(toggled(bool)), movingWindowOpacity, SLOT(setEnabled(bool))); - connect(dockWindowTransparency, SIGNAL(toggled(bool)), dockWindowOpacity, SLOT(setEnabled(bool))); - - connect(useTranslucency, SIGNAL(toggled(bool)), SLOT(changed())); - connect(onlyDecoTranslucent, SIGNAL(toggled(bool)), SLOT(changed())); - connect(activeWindowTransparency, SIGNAL(toggled(bool)), SLOT(changed())); - connect(inactiveWindowTransparency, SIGNAL(toggled(bool)), SLOT(changed())); - connect(movingWindowTransparency, SIGNAL(toggled(bool)), SLOT(changed())); - connect(dockWindowTransparency, SIGNAL(toggled(bool)), SLOT(changed())); - connect(keepAboveAsActive, SIGNAL(toggled(bool)), SLOT(changed())); - connect(disableARGB, SIGNAL(toggled(bool)), SLOT(changed())); - connect(useShadows, SIGNAL(toggled(bool)), SLOT(changed())); - connect(removeShadowsOnResize, SIGNAL(toggled(bool)), SLOT(changed())); - connect(removeShadowsOnMove, SIGNAL(toggled(bool)), SLOT(changed())); - - connect(activeWindowOpacity, SIGNAL(valueChanged(int)), SLOT(changed())); - connect(inactiveWindowOpacity, SIGNAL(valueChanged(int)), SLOT(changed())); - connect(movingWindowOpacity, SIGNAL(valueChanged(int)), SLOT(changed())); - connect(dockWindowOpacity, SIGNAL(valueChanged(int)), SLOT(changed())); - connect(dockWindowShadowSize, SIGNAL(valueChanged(int)), SLOT(changed())); - connect(activeWindowShadowSize, SIGNAL(valueChanged(int)), SLOT(changed())); - connect(inactiveWindowShadowSize, SIGNAL(valueChanged(int)), SLOT(changed())); - connect(shadowTopOffset, SIGNAL(valueChanged(int)), SLOT(changed())); - connect(shadowLeftOffset, SIGNAL(valueChanged(int)), SLOT(changed())); - connect(shadowColor, SIGNAL(changed(const QColor&)), SLOT(changed())); - connect(fadeInWindows, SIGNAL(toggled(bool)), SLOT(changed())); - connect(fadeOnOpacityChange, SIGNAL(toggled(bool)), SLOT(changed())); - connect(fadeInSpeed, SIGNAL(valueChanged(int)), SLOT(changed())); - connect(fadeOutSpeed, SIGNAL(valueChanged(int)), SLOT(changed())); - - connect(useShadows, SIGNAL(toggled(bool)), dockWindowShadowSize, SLOT(setEnabled(bool))); - connect(useShadows, SIGNAL(toggled(bool)), activeWindowShadowSize, SLOT(setEnabled(bool))); - connect(useShadows, SIGNAL(toggled(bool)), inactiveWindowShadowSize, SLOT(setEnabled(bool))); - connect(useShadows, SIGNAL(toggled(bool)), shadowTopOffset, SLOT(setEnabled(bool))); - connect(useShadows, SIGNAL(toggled(bool)), shadowLeftOffset, SLOT(setEnabled(bool))); - connect(useShadows, SIGNAL(toggled(bool)), shadowColor, SLOT(setEnabled(bool))); + connect(useTranslucency, TQT_SIGNAL(toggled(bool)), tabW, TQT_SLOT(setEnabled(bool))); + + connect(activeWindowTransparency, TQT_SIGNAL(toggled(bool)), activeWindowOpacity, TQT_SLOT(setEnabled(bool))); + connect(inactiveWindowTransparency, TQT_SIGNAL(toggled(bool)), inactiveWindowOpacity, TQT_SLOT(setEnabled(bool))); + connect(movingWindowTransparency, TQT_SIGNAL(toggled(bool)), movingWindowOpacity, TQT_SLOT(setEnabled(bool))); + connect(dockWindowTransparency, TQT_SIGNAL(toggled(bool)), dockWindowOpacity, TQT_SLOT(setEnabled(bool))); + + connect(useTranslucency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(onlyDecoTranslucent, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(activeWindowTransparency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(inactiveWindowTransparency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(movingWindowTransparency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(dockWindowTransparency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(keepAboveAsActive, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(disableARGB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(useShadows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(removeShadowsOnResize, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(removeShadowsOnMove, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + + connect(activeWindowOpacity, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(inactiveWindowOpacity, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(movingWindowOpacity, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(dockWindowOpacity, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(dockWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(activeWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(inactiveWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(shadowTopOffset, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(shadowLeftOffset, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(shadowColor, TQT_SIGNAL(changed(const TQColor&)), TQT_SLOT(changed())); + connect(fadeInWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(fadeOnOpacityChange, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(fadeInSpeed, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(fadeOutSpeed, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + + connect(useShadows, TQT_SIGNAL(toggled(bool)), dockWindowShadowSize, TQT_SLOT(setEnabled(bool))); + connect(useShadows, TQT_SIGNAL(toggled(bool)), activeWindowShadowSize, TQT_SLOT(setEnabled(bool))); + connect(useShadows, TQT_SIGNAL(toggled(bool)), inactiveWindowShadowSize, TQT_SLOT(setEnabled(bool))); + connect(useShadows, TQT_SIGNAL(toggled(bool)), shadowTopOffset, TQT_SLOT(setEnabled(bool))); + connect(useShadows, TQT_SIGNAL(toggled(bool)), shadowLeftOffset, TQT_SLOT(setEnabled(bool))); + connect(useShadows, TQT_SIGNAL(toggled(bool)), shadowColor, TQT_SLOT(setEnabled(bool))); load(); tabW->setEnabled(useTranslucency->isChecked()); - connect(useTranslucency, SIGNAL(toggled(bool)), this, SLOT(showWarning(bool))); + connect(useTranslucency, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showWarning(bool))); // handle kompmgr restarts if necessary - connect(useTranslucency, SIGNAL(toggled(bool)), SLOT(resetKompmgr())); - connect(disableARGB, SIGNAL(toggled(bool)), SLOT(resetKompmgr())); - connect(useShadows, SIGNAL(toggled(bool)), SLOT(resetKompmgr())); - connect(inactiveWindowShadowSize, SIGNAL(valueChanged(int)), SLOT(resetKompmgr())); - connect(shadowTopOffset, SIGNAL(valueChanged(int)), SLOT(resetKompmgr())); - connect(shadowLeftOffset, SIGNAL(valueChanged(int)), SLOT(resetKompmgr())); - connect(shadowColor, SIGNAL(changed(const QColor&)), SLOT(resetKompmgr())); - connect(fadeInWindows, SIGNAL(toggled(bool)), SLOT(resetKompmgr())); - connect(fadeOnOpacityChange, SIGNAL(toggled(bool)), SLOT(resetKompmgr())); - connect(fadeInSpeed, SIGNAL(valueChanged(int)), SLOT(resetKompmgr())); - connect(fadeOutSpeed, SIGNAL(valueChanged(int)), SLOT(resetKompmgr())); + connect(useTranslucency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); + connect(disableARGB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); + connect(useShadows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); + connect(inactiveWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr())); + connect(shadowTopOffset, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr())); + connect(shadowLeftOffset, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr())); + connect(shadowColor, TQT_SIGNAL(changed(const TQColor&)), TQT_SLOT(resetKompmgr())); + connect(fadeInWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); + connect(fadeOnOpacityChange, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); + connect(fadeInSpeed, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr())); + connect(fadeOutSpeed, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr())); } } @@ -1524,7 +1524,7 @@ void KTranslucencyConfig::load( void ) movingWindowOpacity->setEnabled(movingWindowTransparency->isChecked()); dockWindowOpacity->setEnabled(dockWindowTransparency->isChecked()); - KConfig conf_(QDir::homeDirPath() + "/.xcompmgrrc"); + KConfig conf_(TQDir::homeDirPath() + "/.xcompmgrrc"); conf_.setGroup("xcompmgr"); disableARGB->setChecked(conf_.readBoolEntry("DisableARGB",FALSE)); @@ -1538,14 +1538,14 @@ void KTranslucencyConfig::load( void ) activeWindowShadowSize->setValue((int)(ass*ss/100.0)); inactiveWindowShadowSize->setValue((int)(iss*ss/100.0)); - QString hex = conf_.readEntry("ShadowColor","#000000"); + TQString hex = conf_.readEntry("ShadowColor","#000000"); uint r, g, b; r = g = b = 256; if (sscanf(hex.latin1(), "0x%02x%02x%02x", &r, &g, &b)!=3 || r > 255 || g > 255 || b > 255) shadowColor->setColor(Qt::black); else - shadowColor->setColor(QColor(r,g,b)); + shadowColor->setColor(TQColor(r,g,b)); fadeInWindows->setChecked(conf_.readBoolEntry("FadeWindows",TRUE)); fadeOnOpacityChange->setChecked(conf_.readBoolEntry("FadeTrans",FALSE)); @@ -1587,7 +1587,7 @@ void KTranslucencyConfig::save( void ) config->writeEntry("OnlyDecoTranslucent", onlyDecoTranslucent->isChecked()); config->writeEntry("ResetKompmgr",resetKompmgr_); - KConfig *conf_ = new KConfig(QDir::homeDirPath() + "/.xcompmgrrc"); + KConfig *conf_ = new KConfig(TQDir::homeDirPath() + "/.xcompmgrrc"); conf_->setGroup("xcompmgr"); conf_->writeEntry("Compmode",useShadows->isChecked()?"CompClientShadows":""); @@ -1598,7 +1598,7 @@ void KTranslucencyConfig::save( void ) int r, g, b; shadowColor->color().rgb( &r, &g, &b ); - QString hex; + TQString hex; hex.sprintf("0x%02X%02X%02X", r,g,b); conf_->writeEntry("ShadowColor",hex); conf_->writeEntry("ShadowRadius",(activeWindowShadowSize->value() + inactiveWindowShadowSize->value()) / 2); diff --git a/kwin/kcmkwin/kwinoptions/windows.h b/kwin/kcmkwin/kwinoptions/windows.h index 14537b922..d236b001c 100644 --- a/kwin/kcmkwin/kwinoptions/windows.h +++ b/kwin/kcmkwin/kwinoptions/windows.h @@ -22,7 +22,7 @@ #ifndef __KWINDOWCONFIG_H__ #define __KWINDOWCONFIG_H__ -#include <qwidget.h> +#include <tqwidget.h> #include <kcmodule.h> #include <config.h> @@ -72,7 +72,7 @@ class KFocusConfig : public KCModule { Q_OBJECT public: - KFocusConfig( bool _standAlone, KConfig *_config, QWidget *parent=0, const char* name=0 ); + KFocusConfig( bool _standAlone, KConfig *_config, TQWidget *parent=0, const char* name=0 ); ~KFocusConfig(); void load(); @@ -109,21 +109,21 @@ private: void setRollOverDesktops(bool); void setShowPopupinfo(bool); - QButtonGroup *fcsBox; - QComboBox *focusCombo; - QCheckBox *autoRaiseOn; - QCheckBox *delayFocusOn; - QCheckBox *clickRaiseOn; + TQButtonGroup *fcsBox; + TQComboBox *focusCombo; + TQCheckBox *autoRaiseOn; + TQCheckBox *delayFocusOn; + TQCheckBox *clickRaiseOn; KIntNumInput *autoRaise; KIntNumInput *delayFocus; - QCheckBox *separateScreenFocus; - QCheckBox *activeMouseScreen; + TQCheckBox *separateScreenFocus; + TQCheckBox *activeMouseScreen; - QButtonGroup *kbdBox; - QCheckBox *altTabPopup; - QCheckBox *traverseAll; - QCheckBox *rollOverDesktops; - QCheckBox *showPopupinfo; + TQButtonGroup *kbdBox; + TQCheckBox *altTabPopup; + TQCheckBox *traverseAll; + TQCheckBox *rollOverDesktops; + TQCheckBox *showPopupinfo; KConfig *config; bool standAlone; @@ -133,7 +133,7 @@ class KMovingConfig : public KCModule { Q_OBJECT public: - KMovingConfig( bool _standAlone, KConfig *config, QWidget *parent=0, const char* name=0 ); + KMovingConfig( bool _standAlone, KConfig *config, TQWidget *parent=0, const char* name=0 ); ~KMovingConfig(); void load(); @@ -161,16 +161,16 @@ private: void setPlacement(int); //CT void setMoveResizeMaximized(bool); - QButtonGroup *windowsBox; - QCheckBox *opaque; - QCheckBox *resizeOpaqueOn; - QCheckBox *geometryTipOn; - QCheckBox* minimizeAnimOn; - QSlider *minimizeAnimSlider; - QLabel *minimizeAnimSlowLabel, *minimizeAnimFastLabel; - QCheckBox *moveResizeMaximized; + TQButtonGroup *windowsBox; + TQCheckBox *opaque; + TQCheckBox *resizeOpaqueOn; + TQCheckBox *geometryTipOn; + TQCheckBox* minimizeAnimOn; + TQSlider *minimizeAnimSlider; + TQLabel *minimizeAnimSlowLabel, *minimizeAnimFastLabel; + TQCheckBox *moveResizeMaximized; - QComboBox *placementCombo; + TQComboBox *placementCombo; KConfig *config; bool standAlone; @@ -180,9 +180,9 @@ private: int getWindowSnapZone(); void setWindowSnapZone( int ); - QVButtonGroup *MagicBox; + TQVButtonGroup *MagicBox; KIntNumInput *BrdrSnap, *WndwSnap; - QCheckBox *OverlapSnap; + TQCheckBox *OverlapSnap; }; @@ -190,7 +190,7 @@ class KAdvancedConfig : public KCModule { Q_OBJECT public: - KAdvancedConfig( bool _standAlone, KConfig *config, QWidget *parent=0, const char* name=0 ); + KAdvancedConfig( bool _standAlone, KConfig *config, TQWidget *parent=0, const char* name=0 ); ~KAdvancedConfig(); void load(); @@ -212,9 +212,9 @@ private: void setShadeHover(bool); void setShadeHoverInterval(int); - QCheckBox *animateShade; - QButtonGroup *shBox; - QCheckBox *shadeHoverOn; + TQCheckBox *animateShade; + TQButtonGroup *shBox; + TQCheckBox *shadeHoverOn; KIntNumInput *shadeHover; KConfig *config; @@ -225,17 +225,17 @@ private: void setElectricBorders( int ); void setElectricBorderDelay( int ); - QVButtonGroup *electricBox; - QRadioButton *active_disable; - QRadioButton *active_move; - QRadioButton *active_always; + TQVButtonGroup *electricBox; + TQRadioButton *active_disable; + TQRadioButton *active_move; + TQRadioButton *active_always; KIntNumInput *delays; void setFocusStealing( int ); void setHideUtilityWindowsForInactive( bool ); - QComboBox* focusStealing; - QCheckBox* hideUtilityWindowsForInactive; + TQComboBox* focusStealing; + TQCheckBox* hideUtilityWindowsForInactive; }; class KProcess; @@ -243,7 +243,7 @@ class KTranslucencyConfig : public KCModule { Q_OBJECT public: - KTranslucencyConfig( bool _standAlone, KConfig *config, QWidget *parent=0, const char* name=0 ); + KTranslucencyConfig( bool _standAlone, KConfig *config, TQWidget *parent=0, const char* name=0 ); ~KTranslucencyConfig(); void load(); @@ -251,21 +251,21 @@ public: void defaults(); private: - QCheckBox *useTranslucency; - QCheckBox *activeWindowTransparency; - QCheckBox *inactiveWindowTransparency; - QCheckBox *movingWindowTransparency; - QCheckBox *dockWindowTransparency; - QCheckBox *keepAboveAsActive; - QCheckBox *disableARGB; - QCheckBox *fadeInWindows; - QCheckBox *fadeOnOpacityChange; - QCheckBox *useShadows; - QCheckBox *removeShadowsOnResize; - QCheckBox *removeShadowsOnMove; - QGroupBox *sGroup; - QCheckBox *onlyDecoTranslucent; -// QPushButton *xcompmgrButton; + TQCheckBox *useTranslucency; + TQCheckBox *activeWindowTransparency; + TQCheckBox *inactiveWindowTransparency; + TQCheckBox *movingWindowTransparency; + TQCheckBox *dockWindowTransparency; + TQCheckBox *keepAboveAsActive; + TQCheckBox *disableARGB; + TQCheckBox *fadeInWindows; + TQCheckBox *fadeOnOpacityChange; + TQCheckBox *useShadows; + TQCheckBox *removeShadowsOnResize; + TQCheckBox *removeShadowsOnMove; + TQGroupBox *sGroup; + TQCheckBox *onlyDecoTranslucent; +// TQPushButton *xcompmgrButton; KIntNumInput *activeWindowOpacity; KIntNumInput *inactiveWindowOpacity; KIntNumInput *movingWindowOpacity; diff --git a/kwin/kcmkwin/kwinrules/detectwidget.cpp b/kwin/kcmkwin/kwinrules/detectwidget.cpp index 1a8fa5af5..1a497c8bc 100644 --- a/kwin/kcmkwin/kwinrules/detectwidget.cpp +++ b/kwin/kcmkwin/kwinrules/detectwidget.cpp @@ -22,9 +22,9 @@ #include <klocale.h> #include <kdebug.h> #include <kwin.h> -#include <qlabel.h> -#include <qradiobutton.h> -#include <qcheckbox.h> +#include <tqlabel.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> #include <X11/Xlib.h> #include <X11/Xatom.h> @@ -34,12 +34,12 @@ namespace KWinInternal { -DetectWidget::DetectWidget( QWidget* parent, const char* name ) +DetectWidget::DetectWidget( TQWidget* parent, const char* name ) : DetectWidgetBase( parent, name ) { } -DetectDialog::DetectDialog( QWidget* parent, const char* name ) +DetectDialog::DetectDialog( TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, "", Ok | Cancel ) , grabber( NULL ) { @@ -109,10 +109,10 @@ void DetectDialog::executeDialog() widget->title_label->setText( title ); widget->extrarole_label->setText( extrarole ); widget->machine_label->setText( machine ); - emit detectionDone( exec() == QDialog::Accepted ); + emit detectionDone( exec() == TQDialog::Accepted ); } -QCString DetectDialog::selectedClass() const +TQCString DetectDialog::selectedClass() const { if( widget->use_class->isChecked() || widget->use_role->isChecked()) return wmclass_class; @@ -124,14 +124,14 @@ bool DetectDialog::selectedWholeClass() const return widget->use_whole_class->isChecked(); } -QCString DetectDialog::selectedRole() const +TQCString DetectDialog::selectedRole() const { if( widget->use_role->isChecked()) return role; return ""; } -QString DetectDialog::selectedTitle() const +TQString DetectDialog::selectedTitle() const { return title; } @@ -151,7 +151,7 @@ NET::WindowType DetectDialog::selectedType() const return type; } -QCString DetectDialog::selectedMachine() const +TQCString DetectDialog::selectedMachine() const { return machine; } @@ -161,22 +161,22 @@ void DetectDialog::selectWindow() // use a dialog, so that all user input is blocked // use WX11BypassWM and moving away so that it's not actually visible // grab only mouse, so that keyboard can be used e.g. for switching windows - grabber = new QDialog( NULL, NULL, true, WX11BypassWM ); + grabber = new TQDialog( NULL, NULL, true, WX11BypassWM ); grabber->move( -1000, -1000 ); grabber->show(); grabber->grabMouse( crossCursor ); grabber->installEventFilter( this ); } -bool DetectDialog::eventFilter( QObject* o, QEvent* e ) +bool DetectDialog::eventFilter( TQObject* o, TQEvent* e ) { if( o != grabber ) return false; - if( e->type() != QEvent::MouseButtonRelease ) + if( e->type() != TQEvent::MouseButtonRelease ) return false; delete grabber; grabber = NULL; - if( static_cast< QMouseEvent* >( e )->button() != LeftButton ) + if( static_cast< TQMouseEvent* >( e )->button() != LeftButton ) { emit detectionDone( false ); return true; diff --git a/kwin/kcmkwin/kwinrules/detectwidget.h b/kwin/kcmkwin/kwinrules/detectwidget.h index 593f4e056..9a2cca3d2 100644 --- a/kwin/kcmkwin/kwinrules/detectwidget.h +++ b/kwin/kcmkwin/kwinrules/detectwidget.h @@ -35,7 +35,7 @@ class DetectWidget { Q_OBJECT public: - DetectWidget( QWidget* parent = NULL, const char* name = NULL ); + DetectWidget( TQWidget* parent = NULL, const char* name = NULL ); }; class DetectDialog @@ -43,35 +43,35 @@ class DetectDialog { Q_OBJECT public: - DetectDialog( QWidget* parent = NULL, const char* name = NULL ); + DetectDialog( TQWidget* parent = NULL, const char* name = NULL ); void detect( WId window ); - QCString selectedClass() const; + TQCString selectedClass() const; bool selectedWholeClass() const; - QCString selectedRole() const; + TQCString selectedRole() const; bool selectedWholeApp() const; NET::WindowType selectedType() const; - QString selectedTitle() const; + TQString selectedTitle() const; Rules::StringMatch titleMatch() const; - QCString selectedMachine() const; + TQCString selectedMachine() const; const KWin::WindowInfo& windowInfo() const; signals: void detectionDone( bool ); protected: - virtual bool eventFilter( QObject* o, QEvent* e ); + virtual bool eventFilter( TQObject* o, TQEvent* e ); private: void selectWindow(); void readWindow( WId window ); void executeDialog(); WId findWindow(); - QCString wmclass_class; - QCString wmclass_name; - QCString role; + TQCString wmclass_class; + TQCString wmclass_name; + TQCString role; NET::WindowType type; - QString title; - QCString extrarole; - QCString machine; + TQString title; + TQCString extrarole; + TQCString machine; DetectWidget* widget; - QDialog* grabber; + TQDialog* grabber; KWin::WindowInfo info; }; diff --git a/kwin/kcmkwin/kwinrules/kcm.cpp b/kwin/kcmkwin/kwinrules/kcm.cpp index b40cfa8b2..19b714311 100644 --- a/kwin/kcmkwin/kwinrules/kcm.cpp +++ b/kwin/kcmkwin/kwinrules/kcm.cpp @@ -19,7 +19,7 @@ #include "kcm.h" #include <kglobal.h> -#include <qlayout.h> +#include <tqlayout.h> #include <klocale.h> #include <kapplication.h> #include <dcopclient.h> @@ -28,7 +28,7 @@ #include "ruleslist.h" extern "C" - KDE_EXPORT KCModule *create_kwinrules( QWidget *parent, const char *name ) + KDE_EXPORT KCModule *create_kwinrules( TQWidget *parent, const char *name ) { //CT there's need for decision: kwm or kwin? KGlobal::locale()->insertCatalogue( "kcmkwinrules" ); @@ -38,14 +38,14 @@ extern "C" namespace KWinInternal { -KCMRules::KCMRules( QWidget *parent, const char *name ) +KCMRules::KCMRules( TQWidget *parent, const char *name ) : KCModule( parent, name ) , config( "kwinrulesrc" ) { - QVBoxLayout *layout = new QVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); widget = new KCMRulesList( this ); layout->addWidget( widget ); - connect( widget, SIGNAL( changed( bool )), SLOT( moduleChanged( bool ))); + connect( widget, TQT_SIGNAL( changed( bool )), TQT_SLOT( moduleChanged( bool ))); KAboutData *about = new KAboutData(I18N_NOOP( "kcmkwinrules" ), I18N_NOOP( "Window-Specific Settings Configuration Module" ), 0, 0, KAboutData::License_GPL, I18N_NOOP( "(c) 2004 KWin and KControl Authors" )); @@ -76,7 +76,7 @@ void KCMRules::defaults() widget->defaults(); } -QString KCMRules::quickHelp() const +TQString KCMRules::quickHelp() const { return i18n("<h1>Window-specific Settings</h1> Here you can customize window settings specifically only" " for some windows." diff --git a/kwin/kcmkwin/kwinrules/kcm.h b/kwin/kcmkwin/kwinrules/kcm.h index 47fba75d2..9fb307458 100644 --- a/kwin/kcmkwin/kwinrules/kcm.h +++ b/kwin/kcmkwin/kwinrules/kcm.h @@ -36,11 +36,11 @@ class KCMRules { Q_OBJECT public: - KCMRules( QWidget *parent, const char *name ); + KCMRules( TQWidget *parent, const char *name ); virtual void load(); virtual void save(); virtual void defaults(); - virtual QString quickHelp() const; + virtual TQString quickHelp() const; protected slots: void moduleChanged( bool state ); private: diff --git a/kwin/kcmkwin/kwinrules/main.cpp b/kwin/kcmkwin/kwinrules/main.cpp index 9657e3649..b58c96239 100644 --- a/kwin/kcmkwin/kwinrules/main.cpp +++ b/kwin/kcmkwin/kwinrules/main.cpp @@ -32,7 +32,7 @@ namespace KWinInternal { -static void loadRules( QValueList< Rules* >& rules ) +static void loadRules( TQValueList< Rules* >& rules ) { KConfig cfg( "kwinrulesrc", true ); cfg.setGroup( "General" ); @@ -41,52 +41,52 @@ static void loadRules( QValueList< Rules* >& rules ) i <= count; ++i ) { - cfg.setGroup( QString::number( i )); + cfg.setGroup( TQString::number( i )); Rules* rule = new Rules( cfg ); rules.append( rule ); } } -static void saveRules( const QValueList< Rules* >& rules ) +static void saveRules( const TQValueList< Rules* >& rules ) { KConfig cfg( "kwinrulesrc" ); - QStringList groups = cfg.groupList(); - for( QStringList::ConstIterator it = groups.begin(); + TQStringList groups = cfg.groupList(); + for( TQStringList::ConstIterator it = groups.begin(); it != groups.end(); ++it ) cfg.deleteGroup( *it ); cfg.setGroup( "General" ); cfg.writeEntry( "count", rules.count()); int i = 1; - for( QValueList< Rules* >::ConstIterator it = rules.begin(); + for( TQValueList< Rules* >::ConstIterator it = rules.begin(); it != rules.end(); ++it ) { - cfg.setGroup( QString::number( i )); + cfg.setGroup( TQString::number( i )); (*it)->write( cfg ); ++i; } } -static Rules* findRule( const QValueList< Rules* >& rules, Window wid, bool whole_app ) +static Rules* findRule( const TQValueList< Rules* >& rules, Window wid, bool whole_app ) { KWin::WindowInfo info = KWin::windowInfo( wid, NET::WMName | NET::WMWindowType, NET::WM2WindowClass | NET::WM2WindowRole | NET::WM2ClientMachine ); if( !info.valid()) // shouldn't really happen return NULL; - QCString wmclass_class = info.windowClassClass().lower(); - QCString wmclass_name = info.windowClassName().lower(); - QCString role = info.windowRole().lower(); + TQCString wmclass_class = info.windowClassClass().lower(); + TQCString wmclass_name = info.windowClassName().lower(); + TQCString role = info.windowRole().lower(); NET::WindowType type = info.windowType( NET::NormalMask | NET::DesktopMask | NET::DockMask | NET::ToolbarMask | NET::MenuMask | NET::DialogMask | NET::OverrideMask | NET::TopMenuMask | NET::UtilityMask | NET::SplashMask ); - QString title = info.name(); -// QCString extrarole = ""; // TODO - QCString machine = info.clientMachine().lower(); + TQString title = info.name(); +// TQCString extrarole = ""; // TODO + TQCString machine = info.clientMachine().lower(); Rules* best_match = NULL; int match_quality = 0; - for( QValueList< Rules* >::ConstIterator it = rules.begin(); + for( TQValueList< Rules* >::ConstIterator it = rules.begin(); it != rules.end(); ++it ) { @@ -233,7 +233,7 @@ static Rules* findRule( const QValueList< Rules* >& rules, Window wid, bool whol static int edit( Window wid, bool whole_app ) { - QValueList< Rules* > rules; + TQValueList< Rules* > rules; loadRules( rules ); Rules* orig_rule = findRule( rules, wid, whole_app ); RulesDialog dlg; @@ -248,7 +248,7 @@ static int edit( Window wid, bool whole_app ) } else if( edited_rule != orig_rule ) { - QValueList< Rules* >::Iterator pos = rules.find( orig_rule ); + TQValueList< Rules* >::Iterator pos = rules.find( orig_rule ); if( pos != rules.end()) *pos = edited_rule; else diff --git a/kwin/kcmkwin/kwinrules/ruleslist.cpp b/kwin/kcmkwin/kwinrules/ruleslist.cpp index f4704089f..e525e472f 100644 --- a/kwin/kcmkwin/kwinrules/ruleslist.cpp +++ b/kwin/kcmkwin/kwinrules/ruleslist.cpp @@ -29,39 +29,39 @@ namespace KWinInternal { -KCMRulesList::KCMRulesList( QWidget* parent, const char* name ) +KCMRulesList::KCMRulesList( TQWidget* parent, const char* name ) : KCMRulesListBase( parent, name ) { - // connect both current/selected, so that current==selected (stupid QListBox :( ) - connect( rules_listbox, SIGNAL( currentChanged( QListBoxItem* )), - SLOT( activeChanged( QListBoxItem*))); - connect( rules_listbox, SIGNAL( selectionChanged( QListBoxItem* )), - SLOT( activeChanged( QListBoxItem*))); - connect( new_button, SIGNAL( clicked()), - SLOT( newClicked())); - connect( modify_button, SIGNAL( clicked()), - SLOT( modifyClicked())); - connect( delete_button, SIGNAL( clicked()), - SLOT( deleteClicked())); - connect( moveup_button, SIGNAL( clicked()), - SLOT( moveupClicked())); - connect( movedown_button, SIGNAL( clicked()), - SLOT( movedownClicked())); - connect( rules_listbox, SIGNAL( doubleClicked ( QListBoxItem * ) ), - SLOT( modifyClicked())); + // connect both current/selected, so that current==selected (stupid TQListBox :( ) + connect( rules_listbox, TQT_SIGNAL( currentChanged( TQListBoxItem* )), + TQT_SLOT( activeChanged( TQListBoxItem*))); + connect( rules_listbox, TQT_SIGNAL( selectionChanged( TQListBoxItem* )), + TQT_SLOT( activeChanged( TQListBoxItem*))); + connect( new_button, TQT_SIGNAL( clicked()), + TQT_SLOT( newClicked())); + connect( modify_button, TQT_SIGNAL( clicked()), + TQT_SLOT( modifyClicked())); + connect( delete_button, TQT_SIGNAL( clicked()), + TQT_SLOT( deleteClicked())); + connect( moveup_button, TQT_SIGNAL( clicked()), + TQT_SLOT( moveupClicked())); + connect( movedown_button, TQT_SIGNAL( clicked()), + TQT_SLOT( movedownClicked())); + connect( rules_listbox, TQT_SIGNAL( doubleClicked ( TQListBoxItem * ) ), + TQT_SLOT( modifyClicked())); load(); } KCMRulesList::~KCMRulesList() { - for( QValueVector< Rules* >::Iterator it = rules.begin(); + for( TQValueVector< Rules* >::Iterator it = rules.begin(); it != rules.end(); ++it ) delete *it; rules.clear(); } -void KCMRulesList::activeChanged( QListBoxItem* item ) +void KCMRulesList::activeChanged( TQListBoxItem* item ) { if( item != NULL ) rules_listbox->setSelected( item, true ); // make current==selected @@ -114,7 +114,7 @@ void KCMRulesList::moveupClicked() assert( pos != -1 ); if( pos > 0 ) { - QString txt = rules_listbox->text( pos ); + TQString txt = rules_listbox->text( pos ); rules_listbox->removeItem( pos ); rules_listbox->insertItem( txt, pos - 1 ); rules_listbox->setSelected( pos - 1, true ); @@ -131,7 +131,7 @@ void KCMRulesList::movedownClicked() assert( pos != -1 ); if( pos < int( rules_listbox->count()) - 1 ) { - QString txt = rules_listbox->text( pos ); + TQString txt = rules_listbox->text( pos ); rules_listbox->removeItem( pos ); rules_listbox->insertItem( txt, pos + 1 ); rules_listbox->setSelected( pos + 1, true ); @@ -145,7 +145,7 @@ void KCMRulesList::movedownClicked() void KCMRulesList::load() { rules_listbox->clear(); - for( QValueVector< Rules* >::Iterator it = rules.begin(); + for( TQValueVector< Rules* >::Iterator it = rules.begin(); it != rules.end(); ++it ) delete *it; @@ -158,7 +158,7 @@ void KCMRulesList::load() i <= count; ++i ) { - cfg.setGroup( QString::number( i )); + cfg.setGroup( TQString::number( i )); Rules* rule = new Rules( cfg ); rules.append( rule ); rules_listbox->insertItem( rule->description ); @@ -172,19 +172,19 @@ void KCMRulesList::load() void KCMRulesList::save() { KConfig cfg( "kwinrulesrc" ); - QStringList groups = cfg.groupList(); - for( QStringList::ConstIterator it = groups.begin(); + TQStringList groups = cfg.groupList(); + for( TQStringList::ConstIterator it = groups.begin(); it != groups.end(); ++it ) cfg.deleteGroup( *it ); cfg.setGroup( "General" ); cfg.writeEntry( "count", rules.count()); int i = 1; - for( QValueVector< Rules* >::ConstIterator it = rules.begin(); + for( TQValueVector< Rules* >::ConstIterator it = rules.begin(); it != rules.end(); ++it ) { - cfg.setGroup( QString::number( i )); + cfg.setGroup( TQString::number( i )); (*it)->write( cfg ); ++i; } diff --git a/kwin/kcmkwin/kwinrules/ruleslist.h b/kwin/kcmkwin/kwinrules/ruleslist.h index b192d2f4e..9dacde63e 100644 --- a/kwin/kcmkwin/kwinrules/ruleslist.h +++ b/kwin/kcmkwin/kwinrules/ruleslist.h @@ -22,7 +22,7 @@ #include "ruleslistbase.h" -#include <qvaluevector.h> +#include <tqvaluevector.h> #include "../../rules.h" @@ -36,7 +36,7 @@ class KCMRulesList { Q_OBJECT public: - KCMRulesList( QWidget* parent = NULL, const char* name = NULL ); + KCMRulesList( TQWidget* parent = NULL, const char* name = NULL ); virtual ~KCMRulesList(); void load(); void save(); @@ -49,9 +49,9 @@ class KCMRulesList void deleteClicked(); void moveupClicked(); void movedownClicked(); - void activeChanged( QListBoxItem* ); + void activeChanged( TQListBoxItem* ); private: - QValueVector< Rules* > rules; + TQValueVector< Rules* > rules; }; } // namespace diff --git a/kwin/kcmkwin/kwinrules/ruleswidget.cpp b/kwin/kcmkwin/kwinrules/ruleswidget.cpp index 7a8afe292..2525644d9 100644 --- a/kwin/kcmkwin/kwinrules/ruleswidget.cpp +++ b/kwin/kcmkwin/kwinrules/ruleswidget.cpp @@ -21,17 +21,17 @@ #include <klineedit.h> #include <krestrictedline.h> #include <kcombobox.h> -#include <qcheckbox.h> +#include <tqcheckbox.h> #include <kpushbutton.h> -#include <qlabel.h> +#include <tqlabel.h> #include <kwinmodule.h> #include <klocale.h> -#include <qregexp.h> -#include <qwhatsthis.h> +#include <tqregexp.h> +#include <tqwhatsthis.h> #include <assert.h> #include <kmessagebox.h> -#include <qtabwidget.h> -#include <qtimer.h> +#include <tqtabwidget.h> +#include <tqtimer.h> #include "../../rules.h" @@ -41,19 +41,19 @@ namespace KWinInternal { #define SETUP( var, type ) \ - connect( enable_##var, SIGNAL( toggled( bool )), rule_##var, SLOT( setEnabled( bool ))); \ - connect( enable_##var, SIGNAL( toggled( bool )), this, SLOT( updateEnable##var())); \ - connect( rule_##var, SIGNAL( activated( int )), this, SLOT( updateEnable##var())); \ - QWhatsThis::add( enable_##var, enableDesc ); \ - QWhatsThis::add( rule_##var, type##RuleDesc ); + connect( enable_##var, TQT_SIGNAL( toggled( bool )), rule_##var, TQT_SLOT( setEnabled( bool ))); \ + connect( enable_##var, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( updateEnable##var())); \ + connect( rule_##var, TQT_SIGNAL( activated( int )), this, TQT_SLOT( updateEnable##var())); \ + TQWhatsThis::add( enable_##var, enableDesc ); \ + TQWhatsThis::add( rule_##var, type##RuleDesc ); -RulesWidget::RulesWidget( QWidget* parent, const char* name ) +RulesWidget::RulesWidget( TQWidget* parent, const char* name ) : RulesWidgetBase( parent, name ) , detect_dlg( NULL ) { - QString enableDesc = + TQString enableDesc = i18n( "Enable this checkbox to alter this window property for the specified window(s)." ); - QString setRuleDesc = + TQString setRuleDesc = i18n( "Specify how the window property should be affected:<ul>" "<li><em>Do Not Affect:</em> The window property will not be affected and therefore" " the default handling for it will be used. Specifying this will block more generic" @@ -68,7 +68,7 @@ RulesWidget::RulesWidget( QWidget* parent, const char* name ) "<li><em>Force temporarily:</em> The window property will be forced to the given value" " until it is hidden (this action will be deleted after the window is hidden).</li>" "</ul>" ); - QString forceRuleDesc = + TQString forceRuleDesc = i18n( "Specify how the window property should be affected:<ul>" "<li><em>Do Not Affect:</em> The window property will not be affected and therefore" " the default handling for it will be used. Specifying this will block more generic" @@ -113,7 +113,7 @@ RulesWidget::RulesWidget( QWidget* parent, const char* name ) for( i = 1; i <= module.numberOfDesktops(); ++i ) - desktop->insertItem( QString::number( i ).rightJustify( 2 ) + ":" + module.desktopName( i )); + desktop->insertItem( TQString::number( i ).rightJustify( 2 ) + ":" + module.desktopName( i )); desktop->insertItem( i18n( "All Desktops" )); } @@ -202,45 +202,45 @@ static const Rules::ForceRule combo_to_force_rule[] = ( Rules::ForceRule )Rules::ForceTemporarily }; -static QString positionToStr( const QPoint& p ) +static TQString positionToStr( const TQPoint& p ) { if( p == invalidPoint ) - return QString::null; - return QString::number( p.x()) + "," + QString::number( p.y()); + return TQString::null; + return TQString::number( p.x()) + "," + TQString::number( p.y()); } -static QPoint strToPosition( const QString& str ) +static TQPoint strToPosition( const TQString& str ) { // two numbers, with + or -, separated by any of , x X : - QRegExp reg( "\\s*([+-]?[0-9]*)\\s*[,xX:]\\s*([+-]?[0-9]*)\\s*" ); + TQRegExp reg( "\\s*([+-]?[0-9]*)\\s*[,xX:]\\s*([+-]?[0-9]*)\\s*" ); if( !reg.exactMatch( str )) return invalidPoint; - return QPoint( reg.cap( 1 ).toInt(), reg.cap( 2 ).toInt()); + return TQPoint( reg.cap( 1 ).toInt(), reg.cap( 2 ).toInt()); } -static QString sizeToStr( const QSize& s ) +static TQString sizeToStr( const TQSize& s ) { if( !s.isValid()) - return QString::null; - return QString::number( s.width()) + "," + QString::number( s.height()); + return TQString::null; + return TQString::number( s.width()) + "," + TQString::number( s.height()); } -static QSize strToSize( const QString& str ) +static TQSize strToSize( const TQString& str ) { // two numbers, with + or -, separated by any of , x X : - QRegExp reg( "\\s*([+-]?[0-9]*)\\s*[,xX:]\\s*([+-]?[0-9]*)\\s*" ); + TQRegExp reg( "\\s*([+-]?[0-9]*)\\s*[,xX:]\\s*([+-]?[0-9]*)\\s*" ); if( !reg.exactMatch( str )) - return QSize(); - return QSize( reg.cap( 1 ).toInt(), reg.cap( 2 ).toInt()); + return TQSize(); + return TQSize( reg.cap( 1 ).toInt(), reg.cap( 2 ).toInt()); } //used for opacity settings -static QString intToStr( const int& s ) +static TQString intToStr( const int& s ) { if( s < 1 || s > 100 ) - return QString::null; - return QString::number(s); + return TQString::null; + return TQString::number(s); } -static int strToInt( const QString& str ) +static int strToInt( const TQString& str ) { int tmp = str.toInt(); if( tmp < 1 || tmp > 100 ) @@ -550,7 +550,7 @@ void RulesWidget::detectClicked() { assert( detect_dlg == NULL ); detect_dlg = new DetectDialog; - connect( detect_dlg, SIGNAL( detectionDone( bool )), this, SLOT( detected( bool ))); + connect( detect_dlg, TQT_SIGNAL( detectionDone( bool )), this, TQT_SLOT( detected( bool ))); detect_dlg->detect( 0 ); } @@ -682,11 +682,11 @@ void RulesWidget::shortcutEditClicked() { EditShortcutDialog dlg( topLevelWidget()); dlg.setShortcut( shortcut->text()); - if( dlg.exec() == QDialog::Accepted ) + if( dlg.exec() == TQDialog::Accepted ) shortcut->setText( dlg.shortcut()); } -RulesDialog::RulesDialog( QWidget* parent, const char* name ) +RulesDialog::RulesDialog( TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Edit Window-Specific Settings" ), Ok | Cancel ) { widget = new RulesWidget( this ); @@ -702,14 +702,14 @@ Rules* RulesDialog::edit( Rules* r, WId window, bool show_hints ) if( window != 0 ) widget->prepareWindowSpecific( window ); if( show_hints ) - QTimer::singleShot( 0, this, SLOT( displayHints())); + TQTimer::singleShot( 0, this, TQT_SLOT( displayHints())); exec(); return rules; } void RulesDialog::displayHints() { - QString str = "<qt><p>"; + TQString str = "<qt><p>"; str += i18n( "This configuration dialog allows altering settings only for the selected window" " or application. Find the setting you want to affect, enable the setting using the checkbox," " select in what way the setting should be affected and to which value." ); @@ -717,7 +717,7 @@ void RulesDialog::displayHints() str += "</p><p>" + i18n( "Consult the documentation for more details." ); #endif str += "</p></qt>"; - KMessageBox::information( this, str, QString::null, "displayhints" ); + KMessageBox::information( this, str, TQString::null, "displayhints" ); } void RulesDialog::accept() @@ -728,7 +728,7 @@ void RulesDialog::accept() KDialogBase::accept(); } -EditShortcut::EditShortcut( QWidget* parent, const char* name ) +EditShortcut::EditShortcut( TQWidget* parent, const char* name ) : EditShortcutBase( parent, name ) { } @@ -736,7 +736,7 @@ EditShortcut::EditShortcut( QWidget* parent, const char* name ) void EditShortcut::editShortcut() { ShortcutDialog dlg( KShortcut( shortcut->text()), topLevelWidget()); - if( dlg.exec() == QDialog::Accepted ) + if( dlg.exec() == TQDialog::Accepted ) shortcut->setText( dlg.shortcut().toString()); } @@ -745,24 +745,24 @@ void EditShortcut::clearShortcut() shortcut->setText( "" ); } -EditShortcutDialog::EditShortcutDialog( QWidget* parent, const char* name ) +EditShortcutDialog::EditShortcutDialog( TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Edit Shortcut" ), Ok | Cancel ) { widget = new EditShortcut( this ); setMainWidget( widget ); } -void EditShortcutDialog::setShortcut( const QString& cut ) +void EditShortcutDialog::setShortcut( const TQString& cut ) { widget->shortcut->setText( cut ); } -QString EditShortcutDialog::shortcut() const +TQString EditShortcutDialog::shortcut() const { return widget->shortcut->text(); } -ShortcutDialog::ShortcutDialog( const KShortcut& cut, QWidget* parent, const char* name ) +ShortcutDialog::ShortcutDialog( const KShortcut& cut, TQWidget* parent, const char* name ) : KShortcutDialog( cut, false /*TODO???*/, parent, name ) { } diff --git a/kwin/kcmkwin/kwinrules/ruleswidget.h b/kwin/kcmkwin/kwinrules/ruleswidget.h index 94af87ef4..b47ad88ab 100644 --- a/kwin/kcmkwin/kwinrules/ruleswidget.h +++ b/kwin/kcmkwin/kwinrules/ruleswidget.h @@ -38,7 +38,7 @@ class RulesWidget { Q_OBJECT public: - RulesWidget( QWidget* parent = NULL, const char* name = NULL ); + RulesWidget( TQWidget* parent = NULL, const char* name = NULL ); void setRules( Rules* r ); Rules* rules() const; bool finalCheck(); @@ -99,7 +99,7 @@ class RulesDialog { Q_OBJECT public: - RulesDialog( QWidget* parent = NULL, const char* name = NULL ); + RulesDialog( TQWidget* parent = NULL, const char* name = NULL ); Rules* edit( Rules* r, WId window, bool show_hints ); protected: virtual void accept(); @@ -115,7 +115,7 @@ class EditShortcut { Q_OBJECT public: - EditShortcut( QWidget* parent = NULL, const char* name = NULL ); + EditShortcut( TQWidget* parent = NULL, const char* name = NULL ); protected: void editShortcut(); void clearShortcut(); @@ -126,9 +126,9 @@ class EditShortcutDialog { Q_OBJECT public: - EditShortcutDialog( QWidget* parent = NULL, const char* name = NULL ); - void setShortcut( const QString& cut ); - QString shortcut() const; + EditShortcutDialog( TQWidget* parent = NULL, const char* name = NULL ); + void setShortcut( const TQString& cut ); + TQString shortcut() const; private: EditShortcut* widget; }; @@ -139,7 +139,7 @@ class ShortcutDialog { Q_OBJECT public: - ShortcutDialog( const KShortcut& cut, QWidget* parent = NULL, const char* name = NULL ); + ShortcutDialog( const KShortcut& cut, TQWidget* parent = NULL, const char* name = NULL ); virtual void accept(); }; |