summaryrefslogtreecommitdiffstats
path: root/kteatime
diff options
context:
space:
mode:
Diffstat (limited to 'kteatime')
-rw-r--r--kteatime/tealist.cpp6
-rw-r--r--kteatime/timeedit.cpp20
-rw-r--r--kteatime/timeedit.h2
-rw-r--r--kteatime/toplevel.cpp48
4 files changed, 38 insertions, 38 deletions
diff --git a/kteatime/tealist.cpp b/kteatime/tealist.cpp
index dcc4209..ae32339 100644
--- a/kteatime/tealist.cpp
+++ b/kteatime/tealist.cpp
@@ -15,12 +15,12 @@ TQString int2time(int time)
{
TQString str;
if (time / 60)
- str.append(i18n("%1 min").tqarg(time / 60));
+ str.append(i18n("%1 min").arg(time / 60));
if (time % 60)
if (str.isEmpty())
- str.append(i18n("%1 s").tqarg(time % 60));
+ str.append(i18n("%1 s").arg(time % 60));
else
- str.append(i18n(" %1 s").tqarg(time % 60));
+ str.append(i18n(" %1 s").arg(time % 60));
return str;
}
diff --git a/kteatime/timeedit.cpp b/kteatime/timeedit.cpp
index 473a11b..ae4a93f 100644
--- a/kteatime/timeedit.cpp
+++ b/kteatime/timeedit.cpp
@@ -8,7 +8,7 @@
#include <klocale.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include "timeedit.h"
#include "timeedit.moc"
@@ -52,24 +52,24 @@ void WrappingSpinBox::stepDown()
TimeEdit::TimeEdit(TQWidget* parent, const char* name)
: TQWidget(parent, name)
{
- tqlayout = new TQHBoxLayout(this);
+ layout = new TQHBoxLayout(this);
minuteBox = new TQSpinBox(0, 300, 1, this);
-// minuteBox->setFixedSize(minuteBox->tqsizeHint());
+// minuteBox->setFixedSize(minuteBox->sizeHint());
TQLabel* min = new TQLabel(i18n(" min"), this);
- min->setFixedSize(min->tqsizeHint());
+ min->setFixedSize(min->sizeHint());
secondBox = new WrappingSpinBox(0, 59, 1, this);
secondBox->setWrapping(true);
-// secondBox->setFixedSize(secondBox->tqsizeHint());
+// secondBox->setFixedSize(secondBox->sizeHint());
TQLabel* sec = new TQLabel(i18n(" sec"),this);
- sec->setFixedSize(sec->tqsizeHint());
+ sec->setFixedSize(sec->sizeHint());
- tqlayout->addWidget(minuteBox);
- tqlayout->addWidget(min);
+ layout->addWidget(minuteBox);
+ layout->addWidget(min);
- tqlayout->addWidget(secondBox);
- tqlayout->addWidget(sec);
+ layout->addWidget(secondBox);
+ layout->addWidget(sec);
connect(minuteBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinBoxValueChanged(int)) );
connect(secondBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinBoxValueChanged(int)) );
diff --git a/kteatime/timeedit.h b/kteatime/timeedit.h
index c614f57..7ff162f 100644
--- a/kteatime/timeedit.h
+++ b/kteatime/timeedit.h
@@ -67,7 +67,7 @@ signals:
protected:
TQSpinBox *minuteBox;
WrappingSpinBox *secondBox;
- TQBoxLayout* tqlayout;
+ TQBoxLayout* layout;
};
#endif
diff --git a/kteatime/toplevel.cpp b/kteatime/toplevel.cpp
index 82539ce..1760f86 100644
--- a/kteatime/toplevel.cpp
+++ b/kteatime/toplevel.cpp
@@ -24,7 +24,7 @@
#include <assert.h>
#include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqhbox.h>
#include <tqvbox.h>
#include <tqlineedit.h>
@@ -207,7 +207,7 @@ void TopLevel::resizeEvent ( TQResizeEvent * )
teaNotReadyPixmap = loadSizedIcon("tea_not_ready", width());
teaAnim1Pixmap = loadSizedIcon("tea_anim1", width());
teaAnim2Pixmap = loadSizedIcon("tea_anim2", width());
- tqrepaint();
+ repaint();
}
/** Handle mousePressEvent */
@@ -302,7 +302,7 @@ void TopLevel::timerEvent(TQTimerEvent *)
menu->setItemChecked(current_selected, true);
}
- TQString teaMessage = i18n("The %1 is now ready!").tqarg(current_name);
+ TQString teaMessage = i18n("The %1 is now ready!").arg(current_name);
// invoke action
if (useNotify) {
KNotifyClient::event(winId(), "tea", teaMessage);
@@ -317,7 +317,7 @@ void TopLevel::timerEvent(TQTimerEvent *)
teaMessage, teaAnim1Pixmap, this, "popup", 0);
// FIXME: does auto-deletion work without timeout?
setToolTip(teaMessage);
- tqrepaint();
+ repaint();
} else {
// timer not yet run out; just update tray-icon (if configured)...
if (useTrayVis) {
@@ -325,18 +325,18 @@ void TopLevel::timerEvent(TQTimerEvent *)
if (pDone - percentDone > 8) {
// update icon not every second, but only if somewhat noticable
percentDone = pDone;
- tqrepaint();
+ repaint();
}
}
// ...and Tooltip
TQString min = int2time(seconds);
- setToolTip(i18n("%1 left for %2").tqarg(min).tqarg(current_name));
+ setToolTip(i18n("%1 left for %2").arg(min).arg(current_name));
}
} else {
// no tea is steeping; just animate icon
if (ready) {
firstFrame = !firstFrame;
- tqrepaint();
+ repaint();
}
}
}
@@ -447,7 +447,7 @@ void TopLevel::start()
ready = false;
enable_menuEntries(); // disable "start", enable "stop"
- tqrepaint();
+ repaint();
}
}
@@ -467,7 +467,7 @@ void TopLevel::stop()
}
setToolTip(i18n("The Tea Cooker"), true);
- tqrepaint();
+ repaint();
}
/* open dialog to start an 'anonymous' tea */
@@ -487,10 +487,10 @@ void TopLevel::anonymous()
prop_box->addWidget(propright);
anon_time = new TimeEdit(propright);
- anon_time->setFixedHeight(anon_time->tqsizeHint().height());
+ anon_time->setFixedHeight(anon_time->sizeHint().height());
anon_time->setValue(DEFAULT_TEA_TIME);
TQLabel *l = new TQLabel(anon_time, i18n("Tea time:"), propleft);
- l->setFixedSize(l->tqsizeHint());
+ l->setFixedSize(l->sizeHint());
top_box->addStretch();
@@ -688,28 +688,28 @@ void TopLevel::config()
btn_new = new TQPushButton(TQString(), listgroup_widget);
TQToolTip::add(btn_new, i18n("New"));
btn_new->setPixmap(SmallIcon("filenew"));
- btn_new->setMinimumSize(btn_new->tqsizeHint() * 1.2);
+ btn_new->setMinimumSize(btn_new->sizeHint() * 1.2);
connect(btn_new, TQT_SIGNAL(clicked()), TQT_SLOT(newButtonClicked()));
hbox->addWidget(btn_new);
btn_del = new TQPushButton(TQString(), listgroup_widget);
TQToolTip::add(btn_del, i18n("Delete"));
btn_del->setIconSet(SmallIconSet("editdelete"));
- btn_del->setMinimumSize(btn_new->tqsizeHint() * 1.2);
+ btn_del->setMinimumSize(btn_new->sizeHint() * 1.2);
connect(btn_del, TQT_SIGNAL(clicked()), TQT_SLOT(delButtonClicked()));
hbox->addWidget(btn_del);
btn_up = new TQPushButton(TQString(), listgroup_widget);
TQToolTip::add(btn_up, i18n("Up"));
btn_up->setIconSet(SmallIconSet("up"));
- btn_up->setMinimumSize(btn_up->tqsizeHint() * 1.2);
+ btn_up->setMinimumSize(btn_up->sizeHint() * 1.2);
connect(btn_up, TQT_SIGNAL(clicked()), TQT_SLOT(upButtonClicked()));
hbox->addWidget(btn_up);
btn_down = new TQPushButton(TQString(), listgroup_widget);
TQToolTip::add(btn_down, i18n("Down"));
btn_down->setIconSet(SmallIconSet("down"));
- btn_down->setMinimumSize(btn_down->tqsizeHint() * 1.2);
+ btn_down->setMinimumSize(btn_down->sizeHint() * 1.2);
connect(btn_down, TQT_SIGNAL(clicked()), TQT_SLOT(downButtonClicked()));
hbox->addWidget(btn_down);
@@ -721,21 +721,21 @@ void TopLevel::config()
rightside->addWidget(editgroup, 0, 0);
TQHBox *propbox = new TQHBox(editgroup);
- // FIXME: - must enforce correct vertical tqalignment of each label-editor pair
+ // FIXME: - must enforce correct vertical alignment of each label-editor pair
// (better use one HBox for each label-editor pair?)
TQVBox *propleft = new TQVBox(propbox);
TQVBox *propright = new TQVBox(propbox);
nameEdit = new TQLineEdit(propright);
- nameEdit->setFixedHeight(nameEdit->tqsizeHint().height());
- nameEdit->tqsetAlignment(TQLineEdit::AlignLeft);
+ nameEdit->setFixedHeight(nameEdit->sizeHint().height());
+ nameEdit->setAlignment(TQLineEdit::AlignLeft);
TQLabel *l = new TQLabel(nameEdit, i18n("Name:"), propleft);
- l->setFixedSize(l->tqsizeHint());
+ l->setFixedSize(l->sizeHint());
connect(nameEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(nameEditTextChanged(const TQString&)) );
timeEdit = new TimeEdit(propright);
- timeEdit->setFixedHeight(timeEdit->tqsizeHint().height());
+ timeEdit->setFixedHeight(timeEdit->sizeHint().height());
l = new TQLabel(timeEdit, i18n("Tea time:"), propleft);
- l->setFixedSize(l->tqsizeHint());
+ l->setFixedSize(l->sizeHint());
connect(timeEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinBoxValueChanged(int)));
/* bottom - timeout actions */
@@ -751,15 +751,15 @@ void TopLevel::config()
eventEnable = new TQCheckBox(i18n("Event"), actiongroup);
popupEnable = new TQCheckBox(i18n("Popup"), actiongroup);
- eventEnable->setFixedHeight(eventEnable->tqsizeHint().height());
- popupEnable->setFixedHeight(popupEnable->tqsizeHint().height());
+ eventEnable->setFixedHeight(eventEnable->sizeHint().height());
+ popupEnable->setFixedHeight(popupEnable->sizeHint().height());
TQHBox *actionbox = new TQHBox(actiongroup);
actionEnable = new TQCheckBox(actionbox);
// FIXME: add text to this line:
// TQLabel *actionLabel = new TQLabel(i18n("Execute: "), actiongroup);
actionEdit = new TQLineEdit(actionbox);
- actionEdit->setFixedHeight(actionEdit->tqsizeHint().height());
+ actionEdit->setFixedHeight(actionEdit->sizeHint().height());
TQToolTip::add(actionEdit, i18n("Enter command here; '%t' will be replaced with name of steeping tea"));
connect(actionEnable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(actionEnableToggled(bool)));
rightside->addStretch();