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/krandrmodule.cpp2
-rw-r--r--kcontrol/randr/krandrpassivepopup.cpp4
-rw-r--r--kcontrol/randr/krandrtray.cpp6
-rw-r--r--kcontrol/randr/ktimerdialog.cpp8
-rw-r--r--kcontrol/randr/ktimerdialog.h2
7 files changed, 16 insertions, 16 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/krandrmodule.cpp b/kcontrol/randr/krandrmodule.cpp
index 087585d3f..4c918c583 100644
--- a/kcontrol/randr/krandrmodule.cpp
+++ b/kcontrol/randr/krandrmodule.cpp
@@ -131,7 +131,7 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis
connect(m_applyOnStartup, TQT_SIGNAL(clicked()), TQT_SLOT(setChanged()));
TQHBox* syncBox = new TQHBox(this);
- syncBox->layout()->addItem(new TQSpacerItem(20, 1, TQSizePolicy::Maximum));
+ syncBox->tqlayout()->addItem(new TQSpacerItem(20, 1, TQSizePolicy::Maximum));
m_syncTrayApp = new TQCheckBox(i18n("Allow tray application to change startup settings"), syncBox);
topLayout->addWidget(syncBox);
TQWhatsThis::add(m_syncTrayApp, i18n("If this option is enabled, options set by the system tray applet will be saved and loaded when KDE starts instead of being temporary."));
diff --git a/kcontrol/randr/krandrpassivepopup.cpp b/kcontrol/randr/krandrpassivepopup.cpp
index 5cf6fa6b2..98c6c0a18 100644
--- a/kcontrol/randr/krandrpassivepopup.cpp
+++ b/kcontrol/randr/krandrpassivepopup.cpp
@@ -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( static_cast< 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..e712b71d6 100644
--- a/kcontrol/randr/krandrtray.cpp
+++ b/kcontrol/randr/krandrtray.cpp
@@ -54,7 +54,7 @@ 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;
@@ -509,7 +509,7 @@ void KRandRSystemTray::slotCycleDisplays()
int current_on_index = -1;
int max_index = -1;
int prev_on_index;
- Status s;
+ tqStatus s;
randr_screen_info = read_screen_info(randr_display);
@@ -782,7 +782,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter)
char *output_name;
RROutput output_id;
int i;
- Status s;
+ tqStatus s;
int num_outputs_on;
num_outputs_on = 0;
diff --git a/kcontrol/randr/ktimerdialog.cpp b/kcontrol/randr/ktimerdialog.cpp
index 071088e9b..3af8fdf1c 100644
--- a/kcontrol/randr/ktimerdialog.cpp
+++ b/kcontrol/randr/ktimerdialog.cpp
@@ -20,7 +20,7 @@
*/
#include <qhbox.h>
-#include <qlayout.h>
+#include <qtqlayout.h>
#include <qvbox.h>
#include <qtimer.h>
#include <qprogressbar.h>
@@ -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 );
diff --git a/kcontrol/randr/ktimerdialog.h b/kcontrol/randr/ktimerdialog.h
index 23b4a92b0..c4037e389 100644
--- a/kcontrol/randr/ktimerdialog.h
+++ b/kcontrol/randr/ktimerdialog.h
@@ -144,7 +144,7 @@ class KTimerDialog : public KDialogBase
private:
/**
- * Prepares the layout that manages the widgets of the dialog
+ * Prepares the tqlayout that manages the widgets of the dialog
*/
void setupLayout();