From a1bd60b34891ccc77056c190d7871bc4b14fe654 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 21:31:21 +0000 Subject: TQt4 port kdetoys This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdetoys@1238103 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kteatime/tealist.cpp | 14 ++++---- kteatime/tealist.h | 6 ++-- kteatime/timeedit.cpp | 26 +++++++------- kteatime/timeedit.h | 12 ++++--- kteatime/toplevel.cpp | 98 +++++++++++++++++++++++++-------------------------- kteatime/toplevel.h | 1 + 6 files changed, 80 insertions(+), 77 deletions(-) (limited to 'kteatime') diff --git a/kteatime/tealist.cpp b/kteatime/tealist.cpp index ae32339..8ef9dc5 100644 --- a/kteatime/tealist.cpp +++ b/kteatime/tealist.cpp @@ -15,24 +15,24 @@ TQString int2time(int time) { TQString str; if (time / 60) - str.append(i18n("%1 min").arg(time / 60)); + str.append(i18n("%1 min").tqarg(time / 60)); if (time % 60) if (str.isEmpty()) - str.append(i18n("%1 s").arg(time % 60)); + str.append(i18n("%1 s").tqarg(time % 60)); else - str.append(i18n(" %1 s").arg(time % 60)); + str.append(i18n(" %1 s").tqarg(time % 60)); return str; } -TeaListItem::TeaListItem(TQListView * parent) - :TQListViewItem(parent) +TeaListItem::TeaListItem(TQListView * tqparent) + :TQListViewItem(tqparent) { } -TeaListItem::TeaListItem(TQListView * parent, TQListViewItem *after) - :TQListViewItem(parent, after) +TeaListItem::TeaListItem(TQListView * tqparent, TQListViewItem *after) + :TQListViewItem(tqparent, after) { } diff --git a/kteatime/tealist.h b/kteatime/tealist.h index c56a16d..8012af9 100644 --- a/kteatime/tealist.h +++ b/kteatime/tealist.h @@ -14,12 +14,12 @@ class TQListView; class TQListViewItem; -class TeaListItem : public QListViewItem +class TeaListItem : public TQListViewItem { public: - TeaListItem(TQListView *parent); - TeaListItem(TQListView *parent, TQListViewItem *after); + TeaListItem(TQListView *tqparent); + TeaListItem(TQListView *tqparent, TQListViewItem *after); ~TeaListItem(); int time(); diff --git a/kteatime/timeedit.cpp b/kteatime/timeedit.cpp index 8cd3d60..5344520 100644 --- a/kteatime/timeedit.cpp +++ b/kteatime/timeedit.cpp @@ -13,8 +13,8 @@ #include "timeedit.h" #include "timeedit.moc" -WrappingSpinBox::WrappingSpinBox(int minValue, int maxValue, int step, TQWidget *parent, const char *name) - : TQSpinBox(minValue, maxValue, step, parent, name) +WrappingSpinBox::WrappingSpinBox(int minValue, int maxValue, int step, TQWidget *tqparent, const char *name) + : TQSpinBox(minValue, maxValue, step, tqparent, name) { } @@ -49,27 +49,27 @@ void WrappingSpinBox::stepDown() // ------------------------------------------------------------------------- -TimeEdit::TimeEdit(TQWidget* parent, const char* name) - : TQWidget(parent, name) +TimeEdit::TimeEdit(TQWidget* tqparent, const char* name) + : TQWidget(tqparent, name) { - layout = new TQHBoxLayout(this); + tqlayout = new TQHBoxLayout(this); minuteBox = new TQSpinBox(0, 300, 1, this); -// minuteBox->setFixedSize(minuteBox->sizeHint()); +// minuteBox->setFixedSize(minuteBox->tqsizeHint()); TQLabel* min = new TQLabel(i18n(" min"), this); - min->setFixedSize(min->sizeHint()); + min->setFixedSize(min->tqsizeHint()); secondBox = new WrappingSpinBox(0, 59, 1, this); secondBox->setWrapping(true); -// secondBox->setFixedSize(secondBox->sizeHint()); +// secondBox->setFixedSize(secondBox->tqsizeHint()); TQLabel* sec = new TQLabel(i18n(" sec"),this); - sec->setFixedSize(sec->sizeHint()); + sec->setFixedSize(sec->tqsizeHint()); - layout->addWidget(minuteBox); - layout->addWidget(min); + tqlayout->addWidget(minuteBox); + tqlayout->addWidget(min); - layout->addWidget(secondBox); - layout->addWidget(sec); + tqlayout->addWidget(secondBox); + tqlayout->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 0be5670..3370dac 100644 --- a/kteatime/timeedit.h +++ b/kteatime/timeedit.h @@ -18,12 +18,13 @@ class TQBoxLayout; * @short A spinbox that wraps around after reaching minValue resp. maxValue. * @author Daniel Teske */ -class WrappingSpinBox : public QSpinBox +class WrappingSpinBox : public TQSpinBox { Q_OBJECT + TQ_OBJECT public: - WrappingSpinBox(int minValue, int maxValue, int step = 1, TQWidget *parent=0, const char *name=0); + WrappingSpinBox(int minValue, int maxValue, int step = 1, TQWidget *tqparent=0, const char *name=0); ~WrappingSpinBox(); void stepUp(); @@ -39,12 +40,13 @@ signals: * @short A widget for entering a timeout in minutes and seconds. * @author Daniel Teske */ -class TimeEdit : public QWidget +class TimeEdit : public TQWidget { Q_OBJECT + TQ_OBJECT public: - TimeEdit(TQWidget* parent = 0, const char* name = 0); + TimeEdit(TQWidget* tqparent = 0, const char* name = 0); ~TimeEdit(); void setValue(int value); @@ -65,7 +67,7 @@ signals: protected: TQSpinBox *minuteBox; WrappingSpinBox *secondBox; - TQBoxLayout* layout; + TQBoxLayout* tqlayout; }; #endif diff --git a/kteatime/toplevel.cpp b/kteatime/toplevel.cpp index df70963..dec77c7 100644 --- a/kteatime/toplevel.cpp +++ b/kteatime/toplevel.cpp @@ -118,13 +118,13 @@ TopLevel::TopLevel() : KSystemTray() startAct = new KAction(i18n("&Start"), "1rightarrow", 0, - this, TQT_SLOT(start()), actionCollection(), "start"); + TQT_TQOBJECT(this), TQT_SLOT(start()), actionCollection(), "start"); stopAct = new KAction(i18n("Sto&p"), "cancel", 0, - this, TQT_SLOT(stop()), actionCollection(), "stop"); + TQT_TQOBJECT(this), TQT_SLOT(stop()), actionCollection(), "stop"); confAct = new KAction(i18n("&Configure..."), "configure", 0, - this, TQT_SLOT(config()), actionCollection(), "configure"); + TQT_TQOBJECT(this), TQT_SLOT(config()), actionCollection(), "configure"); anonAct = new KAction(i18n("&Anonymous..."), 0, 0, - this, TQT_SLOT(anonymous()), actionCollection(), "anonymous"); + TQT_TQOBJECT(this), TQT_SLOT(anonymous()), actionCollection(), "anonymous"); // KAction *quitAct = actionCollection()->action("file_quit"); // create app menu (displayed on right-click) @@ -198,7 +198,7 @@ TopLevel::~TopLevel() delete menu; delete steeping_menu; delete start_menu; - // FIXME: must delete more (like all the QWidgets in config-window)? + // FIXME: must delete more (like all the TQWidgets in config-window)? } void TopLevel::resizeEvent ( TQResizeEvent * ) @@ -207,13 +207,13 @@ void TopLevel::resizeEvent ( TQResizeEvent * ) teaNotReadyPixmap = loadSizedIcon("tea_not_ready", width()); teaAnim1Pixmap = loadSizedIcon("tea_anim1", width()); teaAnim2Pixmap = loadSizedIcon("tea_anim2", width()); - repaint(); + tqrepaint(); } /** Handle mousePressEvent */ void TopLevel::mousePressEvent(TQMouseEvent *event) { - if (event->button() == LeftButton) { + if (event->button() == Qt::LeftButton) { if (ready) { stop(); // reset tooltip and stop animation } else { @@ -222,7 +222,7 @@ void TopLevel::mousePressEvent(TQMouseEvent *event) else start_menu->popup(TQCursor::pos()); } - } else if (event->button() == RightButton) + } else if (event->button() == Qt::RightButton) menu->popup(TQCursor::pos()); // else if (event->button() == MidButton) // currently unused } @@ -251,19 +251,19 @@ void TopLevel::paintEvent(TQPaintEvent *) // overlay pie chart onto tray icon TQPixmap base(*pm); // make copy of base pixmap if (useTrayVis && running) { - // extend mask - TQBitmap mask = *(base.mask()); - TQPainter pm(&mask); - pm.setBrush(Qt::color1); // fill with "foreground-colour" - pm.setPen(Qt::NoPen); // no border needed/wanted + // extend tqmask + TQBitmap tqmask = *(base.tqmask()); + TQPainter pm(&tqmask); + pm.setBrush(TQt::color1); // fill with "foreground-colour" + pm.setPen(TQt::NoPen); // no border needed/wanted pm.drawPie(0+1, ((float) width()/(float) 2.44444444444)+1, (width()/2), (width()/2), 90*16, -360*16); // full circle of small size pm.drawPie(0, ((float) width()/(float) 2.44444444444), ((float) width()/(float) 1.69230769231), ((float) width()/(float) 1.69230769231), 90*16, percentDone*16); // pie part of big size pm.end(); - base.setMask(mask); + base.setMask(tqmask); // draw pie chart TQPainter px(&base); - px.setPen(TQPen(Qt::black, 0)); // black border + px.setPen(TQPen(TQt::black, 0)); // black border px.setBrush(TQColor(192, 0, 0)); // red fill colour for small circle px.drawPie(0+1, ((float) width()/(float) 2.44444444444)+1, (width()/2), (width()/2), 90*16, -360*16); @@ -302,14 +302,14 @@ void TopLevel::timerEvent(TQTimerEvent *) menu->setItemChecked(current_selected, true); } - TQString teaMessage = i18n("The %1 is now ready!").arg(current_name); + TQString teaMessage = i18n("The %1 is now ready!").tqarg(current_name); // invoke action if (useNotify) { KNotifyClient::event(winId(), "tea", teaMessage); } if (useAction && (!action.isEmpty())) { TQString cmd = action; - cmd.replace("%t", current_name); + cmd.tqreplace("%t", current_name); system(TQFile::encodeName(cmd)); } if (usePopup) @@ -317,7 +317,7 @@ void TopLevel::timerEvent(TQTimerEvent *) teaMessage, teaAnim1Pixmap, this, "popup", 0); // FIXME: does auto-deletion work without timeout? setToolTip(teaMessage); - repaint(); + tqrepaint(); } 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; - repaint(); + tqrepaint(); } } // ...and Tooltip TQString min = int2time(seconds); - setToolTip(i18n("%1 left for %2").arg(min).arg(current_name)); + setToolTip(i18n("%1 left for %2").tqarg(min).tqarg(current_name)); } } else { // no tea is steeping; just animate icon if (ready) { firstFrame = !firstFrame; - repaint(); + tqrepaint(); } } } @@ -440,21 +440,21 @@ void TopLevel::start() } // else both are already defined by dialog handler - killTimers(); + TQT_TQOBJECT(this)->killTimers(); startTimer(1000); // 1000ms = 1s (sufficient resolution) running = true; ready = false; enable_menuEntries(); // disable "start", enable "stop" - repaint(); + tqrepaint(); } } /* menu-slot: "stop" selected in menu */ void TopLevel::stop() { - killTimers(); + TQT_TQOBJECT(this)->killTimers(); running = false; ready = false; @@ -467,7 +467,7 @@ void TopLevel::stop() } setToolTip(i18n("The Tea Cooker"), true); - repaint(); + tqrepaint(); } /* 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->sizeHint().height()); + anon_time->setFixedHeight(anon_time->tqsizeHint().height()); anon_time->setValue(DEFAULT_TEA_TIME); TQLabel *l = new TQLabel(anon_time, i18n("Tea time:"), propleft); - l->setFixedSize(l->sizeHint()); + l->setFixedSize(l->tqsizeHint()); top_box->addStretch(); @@ -670,7 +670,7 @@ void TopLevel::config() /* left side - tea list and list-modifying buttons */ TQBoxLayout *leftside = new TQVBoxLayout(box); - TQGroupBox *listgroup = new TQGroupBox(2, Vertical, i18n("Tea List"), page); + TQGroupBox *listgroup = new TQGroupBox(2,Qt::Vertical, i18n("Tea List"), page); leftside->addWidget(listgroup, 0, 0); listbox = new TQListView(listgroup, "listBox"); @@ -685,31 +685,31 @@ void TopLevel::config() TQWidget *listgroup_widget = new TQWidget(listgroup); TQBoxLayout *hbox = new TQHBoxLayout(listgroup_widget); hbox->setSpacing(4); - btn_new = new TQPushButton(TQString::null, listgroup_widget); + btn_new = new TQPushButton(TQString(), listgroup_widget); TQToolTip::add(btn_new, i18n("New")); btn_new->setPixmap(SmallIcon("filenew")); - btn_new->setMinimumSize(btn_new->sizeHint() * 1.2); + btn_new->setMinimumSize(btn_new->tqsizeHint() * 1.2); connect(btn_new, TQT_SIGNAL(clicked()), TQT_SLOT(newButtonClicked())); hbox->addWidget(btn_new); - btn_del = new TQPushButton(TQString::null, listgroup_widget); + btn_del = new TQPushButton(TQString(), listgroup_widget); TQToolTip::add(btn_del, i18n("Delete")); btn_del->setIconSet(SmallIconSet("editdelete")); - btn_del->setMinimumSize(btn_new->sizeHint() * 1.2); + btn_del->setMinimumSize(btn_new->tqsizeHint() * 1.2); connect(btn_del, TQT_SIGNAL(clicked()), TQT_SLOT(delButtonClicked())); hbox->addWidget(btn_del); - btn_up = new TQPushButton(TQString::null, listgroup_widget); + btn_up = new TQPushButton(TQString(), listgroup_widget); TQToolTip::add(btn_up, i18n("Up")); btn_up->setIconSet(SmallIconSet("up")); - btn_up->setMinimumSize(btn_up->sizeHint() * 1.2); + btn_up->setMinimumSize(btn_up->tqsizeHint() * 1.2); connect(btn_up, TQT_SIGNAL(clicked()), TQT_SLOT(upButtonClicked())); hbox->addWidget(btn_up); - btn_down = new TQPushButton(TQString::null, listgroup_widget); + btn_down = new TQPushButton(TQString(), listgroup_widget); TQToolTip::add(btn_down, i18n("Down")); btn_down->setIconSet(SmallIconSet("down")); - btn_down->setMinimumSize(btn_down->sizeHint() * 1.2); + btn_down->setMinimumSize(btn_down->tqsizeHint() * 1.2); connect(btn_down, TQT_SIGNAL(clicked()), TQT_SLOT(downButtonClicked())); hbox->addWidget(btn_down); @@ -717,29 +717,29 @@ void TopLevel::config() /* right side - tea properties */ TQBoxLayout *rightside = new TQVBoxLayout(box); - editgroup = new TQGroupBox(2, Vertical, i18n("Tea Properties"), page); + editgroup = new TQGroupBox(2,Qt::Vertical, i18n("Tea Properties"), page); rightside->addWidget(editgroup, 0, 0); TQHBox *propbox = new TQHBox(editgroup); - // FIXME: - must enforce correct vertical alignment of each label-editor pair + // FIXME: - must enforce correct vertical tqalignment 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->sizeHint().height()); - nameEdit->setAlignment(TQLineEdit::AlignLeft); + nameEdit->setFixedHeight(nameEdit->tqsizeHint().height()); + nameEdit->tqsetAlignment(TQLineEdit::AlignLeft); TQLabel *l = new TQLabel(nameEdit, i18n("Name:"), propleft); - l->setFixedSize(l->sizeHint()); + l->setFixedSize(l->tqsizeHint()); connect(nameEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(nameEditTextChanged(const TQString&)) ); timeEdit = new TimeEdit(propright); - timeEdit->setFixedHeight(timeEdit->sizeHint().height()); + timeEdit->setFixedHeight(timeEdit->tqsizeHint().height()); l = new TQLabel(timeEdit, i18n("Tea time:"), propleft); - l->setFixedSize(l->sizeHint()); + l->setFixedSize(l->tqsizeHint()); connect(timeEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinBoxValueChanged(int))); /* bottom - timeout actions */ - TQGroupBox *actiongroup = new TQGroupBox(4, Vertical, i18n("Action"), page); + TQGroupBox *actiongroup = new TQGroupBox(4,Qt::Vertical, i18n("Action"), page); top_box->addWidget(actiongroup, 0, 0); TQWidget *actionconf_widget = new TQWidget(actiongroup); @@ -751,15 +751,15 @@ void TopLevel::config() eventEnable = new TQCheckBox(i18n("Event"), actiongroup); popupEnable = new TQCheckBox(i18n("Popup"), actiongroup); - eventEnable->setFixedHeight(eventEnable->sizeHint().height()); - popupEnable->setFixedHeight(popupEnable->sizeHint().height()); + eventEnable->setFixedHeight(eventEnable->tqsizeHint().height()); + popupEnable->setFixedHeight(popupEnable->tqsizeHint().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->sizeHint().height()); + actionEdit->setFixedHeight(actionEdit->tqsizeHint().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(); @@ -776,7 +776,7 @@ void TopLevel::config() } // now add all defined teas (and their times) to the listview - // this is done backwards because QListViewItems are inserted at the top + // this is done backwards because TQListViewItems are inserted at the top listbox->clear(); for (int i=teas.count()-1; i>=0; i--) { TeaListItem *item = new TeaListItem(listbox); @@ -816,7 +816,7 @@ void TopLevel::config() teas.clear(); - // Copy over teas and times from the QListView + // Copy over teas and times from the TQListView int i = 0; teas.clear(); teas.resize(listbox->childCount()); diff --git a/kteatime/toplevel.h b/kteatime/toplevel.h index 7e73994..4ad443e 100644 --- a/kteatime/toplevel.h +++ b/kteatime/toplevel.h @@ -43,6 +43,7 @@ class TimeEdit; class TopLevel : public KSystemTray { Q_OBJECT + TQ_OBJECT public: -- cgit v1.2.1