summaryrefslogtreecommitdiffstats
path: root/kcontrol/clock
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
commit8155225c9be993acc0512956416d195edfef4eb9 (patch)
treede4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kcontrol/clock
parent364641b8e0279758d236af39abd138d379328a19 (diff)
downloadtdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz
tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcontrol/clock')
-rw-r--r--kcontrol/clock/dtime.cpp22
-rw-r--r--kcontrol/clock/dtime.h26
-rw-r--r--kcontrol/clock/tzone.cpp4
-rw-r--r--kcontrol/clock/tzone.h2
4 files changed, 27 insertions, 27 deletions
diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp
index 109e436c4..7de5c7890 100644
--- a/kcontrol/clock/dtime.cpp
+++ b/kcontrol/clock/dtime.cpp
@@ -89,7 +89,7 @@ Dtime::Dtime(TQWidget * parent, const char *name)
TQVBoxLayout *l1 = new TQVBoxLayout( dateBox, KDialog::spacingHint() );
cal = new KDatePicker( dateBox );
- cal->setMinimumSize(cal->sizeHint());
+ cal->setMinimumSize(cal->tqsizeHint());
l1->addWidget( cal );
TQWhatsThis::add( cal, i18n("Here you can change the system date's day of the month, month and year.") );
@@ -120,7 +120,7 @@ Dtime::Dtime(TQWidget * parent, const char *name)
TQLabel *dots1 = new TQLabel(":", timeBox);
dots1->setMinimumWidth( 7 );
- dots1->setAlignment( TQLabel::AlignCenter );
+ dots1->tqsetAlignment( TQLabel::AlignCenter );
v3->addMultiCellWidget(dots1, 0, 1, 3, 3 );
minute = new HMSTimeWidget( timeBox );
@@ -132,7 +132,7 @@ Dtime::Dtime(TQWidget * parent, const char *name)
TQLabel *dots2 = new TQLabel(":", timeBox);
dots2->setMinimumWidth( 7 );
- dots2->setAlignment( TQLabel::AlignCenter );
+ dots2->tqsetAlignment( TQLabel::AlignCenter );
v3->addMultiCellWidget(dots2, 0, 1, 5, 5 );
second = new HMSTimeWidget( timeBox );
@@ -272,7 +272,7 @@ void Dtime::save()
list.append(timeServerList->currentText());
for ( int i=0; i<timeServerList->count();i++ ) {
TQString text = timeServerList->text(i);
- if( list.find(text) == list.end())
+ if( list.tqfind(text) == list.end())
list.append(text);
// Limit so errors can go away and not stored forever
if( list.count() == 10)
@@ -284,16 +284,16 @@ void Dtime::save()
if(setDateTimeAuto->isChecked() && !ntpUtility.isEmpty()){
// NTP Time setting
TQString timeServer = timeServerList->currentText();
- if( timeServer.find( TQRegExp(".*\\(.*\\)$") ) != -1 ) {
- timeServer.replace( TQRegExp(".*\\("), "" );
- timeServer.replace( TQRegExp("\\).*"), "" );
+ if( timeServer.tqfind( TQRegExp(".*\\(.*\\)$") ) != -1 ) {
+ timeServer.tqreplace( TQRegExp(".*\\("), "" );
+ timeServer.tqreplace( TQRegExp("\\).*"), "" );
// Would this be better?: s/^.*\(([^)]*)\).*$/\1/
}
KProcess proc;
proc << ntpUtility << timeServer;
proc.start( KProcess::Block );
if( proc.exitStatus() != 0 ){
- KMessageBox::error( this, i18n(TQString("Unable to contact time server: %1.").arg(timeServer).latin1()));
+ KMessageBox::error( this, i18n(TQString("Unable to contact time server: %1.").tqarg(timeServer).latin1()));
setDateTimeAuto->setChecked( false );
}
else {
@@ -368,7 +368,7 @@ TQString Dtime::quickHelp() const
void Kclock::setTime(const TQTime &time)
{
this->time = time;
- repaint();
+ tqrepaint();
}
void Kclock::paintEvent( TQPaintEvent * )
@@ -382,8 +382,8 @@ void Kclock::paintEvent( TQPaintEvent * )
TQPointArray pts;
TQPoint cp = rect().center();
int d = QMIN(width(),height());
- TQColor hands = colorGroup().dark();
- TQColor shadow = colorGroup().text();
+ TQColor hands = tqcolorGroup().dark();
+ TQColor shadow = tqcolorGroup().text();
paint.setPen( shadow );
paint.setBrush( shadow );
paint.setViewport(4,4,width(),height());
diff --git a/kcontrol/clock/dtime.h b/kcontrol/clock/dtime.h
index cf6cccc63..c48b7ecee 100644
--- a/kcontrol/clock/dtime.h
+++ b/kcontrol/clock/dtime.h
@@ -45,7 +45,7 @@ class HMSTimeWidget : public KIntSpinBox
TQString mapValueToText(int);
};
-class Dtime : public QWidget
+class Dtime : public TQWidget
{
Q_OBJECT
public:
@@ -68,15 +68,15 @@ signals:
private:
void findNTPutility();
- QString ntpUtility;
+ TQString ntpUtility;
TQWidget* privateLayoutWidget;
- QCheckBox *setDateTimeAuto;
- QComboBox *timeServerList;
+ TQCheckBox *setDateTimeAuto;
+ TQComboBox *timeServerList;
KDatePicker *cal;
- QComboBox *month;
- QSpinBox *year;
+ TQComboBox *month;
+ TQSpinBox *year;
HMSTimeWidget *hour;
HMSTimeWidget *minute;
@@ -84,17 +84,17 @@ private:
Kclock *kclock;
- QTime time;
- QDate date;
- QTimer internalTimer;
+ TQTime time;
+ TQDate date;
+ TQTimer internalTimer;
- QString BufS;
+ TQString BufS;
int BufI;
bool refresh;
bool ontimeout;
};
-class Kclock : public QWidget
+class Kclock : public TQWidget
{
Q_OBJECT
@@ -109,7 +109,7 @@ protected:
private:
- QTime time;
+ TQTime time;
};
class KStrictIntValidator : public TQIntValidator
@@ -117,7 +117,7 @@ class KStrictIntValidator : public TQIntValidator
public:
KStrictIntValidator(int bottom, int top, TQWidget * parent,
const char * name = 0 )
- : TQIntValidator(bottom, top, parent, name) {};
+ : TQIntValidator(bottom, top, TQT_TQOBJECT(parent), name) {};
TQValidator::State validate( TQString & input, int & d ) const;
};
diff --git a/kcontrol/clock/tzone.cpp b/kcontrol/clock/tzone.cpp
index 506bde5b6..9812fcd7c 100644
--- a/kcontrol/clock/tzone.cpp
+++ b/kcontrol/clock/tzone.cpp
@@ -77,7 +77,7 @@ void Tzone::currentZone()
time_t now = time(0);
tzset();
strftime(result.data(), result.size(), "%Z", localtime(&now));
- m_local->setText(localZone.arg(KTimezoneWidget::displayName(m_zoneDb.local())).arg(result));
+ m_local->setText(localZone.tqarg(KTimezoneWidget::displayName(m_zoneDb.local())).tqarg(static_cast<const char *>(result)));
}
// FIXME: Does the logic in this routine actually work correctly? For example,
@@ -113,7 +113,7 @@ void Tzone::save()
for (TQString line = is.readLine(); !line.isNull();
line = is.readLine())
{
- if (line.find("TZ=") == 0)
+ if (line.tqfind("TZ=") == 0)
{
*ts << "TZ=" << selectedzone << endl;
found = true;
diff --git a/kcontrol/clock/tzone.h b/kcontrol/clock/tzone.h
index 3e874472f..1ecfc225e 100644
--- a/kcontrol/clock/tzone.h
+++ b/kcontrol/clock/tzone.h
@@ -29,7 +29,7 @@
class TQComboBox;
class TQLabel;
-class Tzone : public QVGroupBox
+class Tzone : public TQVGroupBox
{
Q_OBJECT