summaryrefslogtreecommitdiffstats
path: root/kcontrol/randr
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/randr')
-rw-r--r--kcontrol/randr/configdialog.cpp2
-rw-r--r--kcontrol/randr/configdialog.h8
-rw-r--r--kcontrol/randr/krandrbindings.cpp4
-rw-r--r--kcontrol/randr/krandrmodule.cpp22
-rw-r--r--kcontrol/randr/krandrpassivepopup.cpp6
-rw-r--r--kcontrol/randr/krandrtray.cpp14
-rw-r--r--kcontrol/randr/ktimerdialog.cpp6
7 files changed, 31 insertions, 31 deletions
diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp
index e97cf4836..f48d621cf 100644
--- a/kcontrol/randr/configdialog.cpp
+++ b/kcontrol/randr/configdialog.cpp
@@ -60,7 +60,7 @@ void ConfigDialog::show()
{
if ( !isVisible() ) {
KWinModule module(0, KWinModule::INFO_DESKTOP);
- TQSize s1 = sizeHint();
+ TQSize s1 = tqsizeHint();
TQSize s2 = module.workArea().size();
int w = s1.width();
int h = s1.height();
diff --git a/kcontrol/randr/configdialog.h b/kcontrol/randr/configdialog.h
index 584237975..615d9a2f5 100644
--- a/kcontrol/randr/configdialog.h
+++ b/kcontrol/randr/configdialog.h
@@ -62,11 +62,11 @@ public:
ListView( ConfigDialog* configWidget, TQWidget *parent, const char *name )
: KListView( parent, name ), _configWidget( configWidget ),
_regExpEditor(0L) {}
- // TQListView has a weird idea of a sizeHint...
- virtual TQSize sizeHint () const {
- int w = minimumSizeHint().width();
+ // TQListView has a weird idea of a tqsizeHint...
+ virtual TQSize tqsizeHint () const {
+ int w = tqminimumSizeHint().width();
int h = header()->height();
- h += viewport()->sizeHint().height();
+ h += viewport()->tqsizeHint().height();
h += horizontalScrollBar()->height();
TQListViewItem *item = firstChild();
diff --git a/kcontrol/randr/krandrbindings.cpp b/kcontrol/randr/krandrbindings.cpp
index 4857651a1..29b2b73c2 100644
--- a/kcontrol/randr/krandrbindings.cpp
+++ b/kcontrol/randr/krandrbindings.cpp
@@ -19,10 +19,10 @@
*/
#ifndef NOSLOTS
# define DEF( name, key3, key4, fnSlot ) \
- keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) )
+ keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) )
#else
# define DEF( name, key3, key4, fnSlot ) \
- keys->insert( name, i18n(name), TQString::null, key3, key4 )
+ keys->insert( name, i18n(name), TQString(), key3, key4 )
#endif
#define WIN KKey::QtWIN
diff --git a/kcontrol/randr/krandrmodule.cpp b/kcontrol/randr/krandrmodule.cpp
index 087585d3f..668b36ddb 100644
--- a/kcontrol/randr/krandrmodule.cpp
+++ b/kcontrol/randr/krandrmodule.cpp
@@ -92,7 +92,7 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis
m_screenSelector = new KComboBox(screenBox);
for (int s = 0; s < numScreens(); s++) {
- m_screenSelector->insertItem(i18n("Screen %1").arg(s+1));
+ m_screenSelector->insertItem(i18n("Screen %1").tqarg(s+1));
}
m_screenSelector->setCurrentItem(currentScreenIndex());
@@ -171,7 +171,7 @@ void KRandRModule::slotScreenChanged(int screen)
// Add new resolutions
for (int i = 0; i < currentScreen()->numSizes(); i++) {
- m_sizeCombo->insertItem(i18n("%1 x %2").arg(currentScreen()->pixelSize(i).width()).arg(currentScreen()->pixelSize(i).height()));
+ m_sizeCombo->insertItem(i18n("%1 x %2").tqarg(currentScreen()->pixelSize(i).width()).tqarg(currentScreen()->pixelSize(i).height()));
// Aspect ratio
/* , aspect ratio %5)*/
@@ -180,7 +180,7 @@ void KRandRModule::slotScreenChanged(int screen)
// Clear rotations
for (int i = m_rotationGroup->count() - 1; i >= 0; i--)
- m_rotationGroup->remove(m_rotationGroup->find(i));
+ m_rotationGroup->remove(m_rotationGroup->tqfind(i));
// Create rotations
for (int i = 0; i < RandRScreen::OrientationCount; i++)
@@ -195,21 +195,21 @@ void KRandRModule::slotScreenChanged(int screen)
void KRandRModule::slotRotationChanged()
{
- if (m_rotationGroup->find(0)->isOn())
+ if (m_rotationGroup->tqfind(0)->isOn())
currentScreen()->proposeRotation(RandRScreen::Rotate0);
- else if (m_rotationGroup->find(1)->isOn())
+ else if (m_rotationGroup->tqfind(1)->isOn())
currentScreen()->proposeRotation(RandRScreen::Rotate90);
- else if (m_rotationGroup->find(2)->isOn())
+ else if (m_rotationGroup->tqfind(2)->isOn())
currentScreen()->proposeRotation(RandRScreen::Rotate180);
else {
- Q_ASSERT(m_rotationGroup->find(3)->isOn());
+ Q_ASSERT(m_rotationGroup->tqfind(3)->isOn());
currentScreen()->proposeRotation(RandRScreen::Rotate270);
}
- if (m_rotationGroup->find(4)->isOn())
+ if (m_rotationGroup->tqfind(4)->isOn())
currentScreen()->proposeRotation(currentScreen()->proposedRotation() ^ RandRScreen::ReflectX);
- if (m_rotationGroup->find(5)->isOn())
+ if (m_rotationGroup->tqfind(5)->isOn())
currentScreen()->proposeRotation(currentScreen()->proposedRotation() ^ RandRScreen::ReflectY);
setChanged();
@@ -353,8 +353,8 @@ void KRandRModule::update()
Q_ASSERT(currentScreen()->proposedRotation() & RandRScreen::RotateMask);
break;
}
- m_rotationGroup->find(4)->setDown(currentScreen()->proposedRotation() & RandRScreen::ReflectX);
- m_rotationGroup->find(5)->setDown(currentScreen()->proposedRotation() & RandRScreen::ReflectY);
+ m_rotationGroup->tqfind(4)->setDown(currentScreen()->proposedRotation() & RandRScreen::ReflectX);
+ m_rotationGroup->tqfind(5)->setDown(currentScreen()->proposedRotation() & RandRScreen::ReflectY);
m_rotationGroup->blockSignals(false);
m_refreshRates->blockSignals(true);
diff --git a/kcontrol/randr/krandrpassivepopup.cpp b/kcontrol/randr/krandrpassivepopup.cpp
index 5cf6fa6b2..207dfac2e 100644
--- a/kcontrol/randr/krandrpassivepopup.cpp
+++ b/kcontrol/randr/krandrpassivepopup.cpp
@@ -60,7 +60,7 @@ void KRandrPassivePopup::startWatchingWidget( TQWidget* widget_P )
break;
win = parent;
- TQWidget* widget = TQWidget::find( win );
+ TQWidget* widget = TQWidget::tqfind( win );
if( widget != NULL )
{
widget->installEventFilter( this );
@@ -94,14 +94,14 @@ void KRandrPassivePopup::startWatchingWidget( TQWidget* widget_P )
bool KRandrPassivePopup::eventFilter( TQObject* o, TQEvent* e )
{
if( e->type() == TQEvent::Move && o->isWidgetType()
- && watched_widgets.contains( static_cast< TQWidget* >( o )))
+ && watched_widgets.tqcontains( TQT_TQWIDGET( o )))
TQTimer::singleShot( 0, this, TQT_SLOT( slotPositionSelf()));
return false;
}
bool KRandrPassivePopup::x11Event( XEvent* e )
{
- if( e->type == ConfigureNotify && watched_windows.contains( e->xconfigure.window ))
+ if( e->type == ConfigureNotify && watched_windows.tqcontains( e->xconfigure.window ))
{
if( !update_timer.isActive())
update_timer.start( 10, true );
diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp
index e35fba9d2..49e0c17af 100644
--- a/kcontrol/randr/krandrtray.cpp
+++ b/kcontrol/randr/krandrtray.cpp
@@ -54,13 +54,13 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
, m_help(new KHelpMenu(this, KGlobal::instance()->aboutData(), false, actionCollection()))
{
setPixmap(KSystemTray::loadSizedIcon("randr", width()));
- setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+ tqsetAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit()));
TQToolTip::add(this, i18n("Screen resize & rotate"));
my_parent = parent;
//printf("Reading configuration...\n\r");
- globalKeys = new KGlobalAccel(this);
+ globalKeys = new KGlobalAccel(TQT_TQOBJECT(this));
KGlobalAccel* keys = globalKeys;
#include "krandrbindings.cpp"
// the keys need to be read from kdeglobals, not kickerrc
@@ -123,7 +123,7 @@ void KRandRSystemTray::resizeEvent ( TQResizeEvent * )
void KRandRSystemTray::mousePressEvent(TQMouseEvent* e)
{
// Popup the context menu with left-click
- if (e->button() == LeftButton) {
+ if (e->button() == Qt::LeftButton) {
contextMenuAboutToShow(contextMenu());
contextMenu()->popup(e->globalPos());
e->accept();
@@ -205,7 +205,7 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu)
/*lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1));
menu->setItemEnabled(lastIndex, false);*/
} else {
- KPopupMenu* subMenu = new KPopupMenu(menu, TQString("screen%1").arg(s+1).latin1());
+ KPopupMenu* subMenu = new KPopupMenu(menu, TQString("screen%1").tqarg(s+1).latin1());
m_screenPopups.append(subMenu);
populateMenu(subMenu);
lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1), subMenu);
@@ -237,7 +237,7 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu)
menu->insertTitle(SmallIcon("randr"), i18n("Global Configuation"));
KAction *actColors = new KAction( i18n( "Configure Color Profiles..." ),
- SmallIconSet( "configure" ), KShortcut(), this, TQT_SLOT( slotColorConfig() ),
+ SmallIconSet( "configure" ), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotColorConfig() ),
actionCollection() );
actColors->plug( menu );
@@ -247,7 +247,7 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu)
// actPrefs->plug( menu );
KAction *actSKeys = new KAction( i18n( "Configure Shortcut Keys..." ),
- SmallIconSet( "configure" ), KShortcut(), this, TQT_SLOT( slotSKeys() ),
+ SmallIconSet( "configure" ), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotSKeys() ),
actionCollection() );
actSKeys->plug( menu );
@@ -260,7 +260,7 @@ void KRandRSystemTray::contextMenuAboutToShow(KPopupMenu* menu)
void KRandRSystemTray::slotScreenActivated()
{
- setCurrentScreen(m_screenPopups.find(static_cast<const KPopupMenu*>(sender())));
+ setCurrentScreen(m_screenPopups.tqfind(static_cast<const KPopupMenu*>(sender())));
}
void KRandRSystemTray::configChanged()
diff --git a/kcontrol/randr/ktimerdialog.cpp b/kcontrol/randr/ktimerdialog.cpp
index 071088e9b..cd72859db 100644
--- a/kcontrol/randr/ktimerdialog.cpp
+++ b/kcontrol/randr/ktimerdialog.cpp
@@ -56,8 +56,8 @@ KTimerDialog::KTimerDialog( int msec, TimerStyle style, QWidget *parent,
if ( buttonMask & Cancel )
buttonOnTimeout = Cancel;
- connect( totalTimer, SIGNAL( timeout() ), SLOT( slotInternalTimeout() ) );
- connect( updateTimer, SIGNAL( timeout() ), SLOT( slotUpdateTime() ) );
+ connect( totalTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotInternalTimeout() ) );
+ connect( updateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotUpdateTime() ) );
// create the widgets
mainWidget = new QVBox( this, "mainWidget" );
@@ -95,7 +95,7 @@ void KTimerDialog::setMainWidget( QWidget *widget )
// yuck, here goes.
QVBox *newWidget = new QVBox( this );
- if ( widget->parentWidget() != mainWidget ) {
+ if ( widget->tqparentWidget() != mainWidget ) {
widget->reparent( newWidget, 0, QPoint(0,0) );
} else {
newWidget->insertChild( widget );
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-05 16:01:49 +0000