From 90705c50d34801a0f7516ddc4d3bf6c295413297 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:56:28 -0600 Subject: [PATCH] Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit e29455aea4fc1fda591862200c6321a3722e134c. --- src/knutanalog.cpp | 38 +++++++++++++++++++------------------- src/knutanalog.h | 30 +++++++++++++++--------------- src/knutclient.cpp | 10 +++++----- src/knutclient.h | 2 +- src/knutdock.cpp | 20 ++++++++++---------- src/knutdock.h | 10 +++++----- src/knutfrontpanel.cpp | 8 ++++---- src/knutinstcomms.cpp | 4 ++-- src/knutmainwindow.cpp | 28 ++++++++++++++-------------- src/knutmainwindow.h | 6 +++--- src/knutmessage.cpp | 2 +- src/knutmessagemanager.h | 2 +- src/knutnet.cpp | 6 +++--- src/knutnet.h | 4 ++-- src/knutnewupsdlg.cpp | 4 ++-- src/knutpanelmeter.cpp | 14 +++++++------- src/knutpanelmeter.h | 4 ++-- src/knutprefdlg.cpp | 12 ++++++------ src/knutprintupsvar.h | 2 +- src/knutrwvar.cpp | 8 ++++---- 20 files changed, 107 insertions(+), 107 deletions(-) diff --git a/src/knutanalog.cpp b/src/knutanalog.cpp index c3da789..9c0cab4 100644 --- a/src/knutanalog.cpp +++ b/src/knutanalog.cpp @@ -153,7 +153,7 @@ void KNutAnalog::makeBackground (bool run) { paintBackGround(); m_showBackGround = true; if (run) { - repaint(); + tqrepaint(); } } @@ -165,7 +165,7 @@ void KNutAnalog::setText (TQString inscription, TQString text_up, bool run) { if (run) { paintBackGround(); m_showBackGround = true; - repaint(); + tqrepaint(); } } @@ -183,7 +183,7 @@ void KNutAnalog::setDefaultArcColor(bool run) { if (run) { paintBackGround(); m_showBackGround=true; - repaint(); + tqrepaint(); } } @@ -204,7 +204,7 @@ void KNutAnalog::addArc (double startOfCircle, double endOfCircle, int regColor, if (run) { paintBackGround(); m_showBackGround = true; - repaint (); + tqrepaint (); } } @@ -215,7 +215,7 @@ void KNutAnalog::delArc (bool run) { if (run) { paintBackGround(); m_showBackGround = true; - repaint (); + tqrepaint (); } } @@ -230,7 +230,7 @@ void KNutAnalog::setRange (int Astart, int Aend , bool run) { if (run) { paintBackGround(); m_showBackGround = true; - repaint (); + tqrepaint (); } } @@ -242,7 +242,7 @@ void KNutAnalog::setMember (int Count, bool run) { if (run) { paintBackGround(); m_showBackGround = true; - repaint (); + tqrepaint (); } } @@ -254,7 +254,7 @@ void KNutAnalog::setPointerColor (TQColor pointerColor, bool run ) { paintPointer(); m_showPointer = true; if (run) { - repaint (); + tqrepaint (); } } @@ -264,7 +264,7 @@ void KNutAnalog::repaintPointer ( bool run ) { paintPointer(); m_showPointer = true; if (run) { - repaint (); + tqrepaint (); } } @@ -277,7 +277,7 @@ void KNutAnalog::setFontColor (TQColor fontColor, bool run ) { if (run) { paintBackGround(); m_showBackGround = true; - repaint (); + tqrepaint (); } } @@ -288,7 +288,7 @@ void KNutAnalog::setScaleColor (TQColor scaleColor, bool run) { if (run) { paintBackGround(); m_showBackGround = true; - repaint (); + tqrepaint (); } } @@ -307,7 +307,7 @@ void KNutAnalog::setDigitalProcesing (int qualityOfPointer, bool run ) { } paintPointer(); m_showPointer = true; // pri jakemkoliv prekresleni prekreslime rucicku - if (run) repaint (); + if (run) tqrepaint (); } @@ -320,7 +320,7 @@ void KNutAnalog::setPointer (double pointerValue, bool run ) { if (run) { // paintPointer(); m_showPointer = true; // pri jakemkoliv prekresleni prekreslime rucicku - repaint (); + tqrepaint (); } } } @@ -333,26 +333,26 @@ void KNutAnalog::slotSetScaleFont(TQFont newScaleFont){ m_scaleFont = newScaleFont; paintBackGround(); m_showBackGround=true; - repaint(); + tqrepaint(); } void KNutAnalog::slotSetTextFont(TQFont newTextFont){ m_textFont = newTextFont; paintBackGround(); - paintPointer(); // repaint values if pointer + paintPointer(); // tqrepaint values if pointer m_showBackGround=true; m_showPointer=true; - repaint(); + tqrepaint(); } void KNutAnalog::slotSetAllFont(TQFont newAllFont){ m_scaleFont = newAllFont; m_textFont = newAllFont; paintBackGround(); - paintPointer(); // repaint values if pointer + paintPointer(); // tqrepaint values if pointer m_showBackGround=true; m_showPointer=true; - repaint(); + tqrepaint(); } @@ -360,7 +360,7 @@ void KNutAnalog::repaintAll (void) { paintBackGround(); m_showBackGround = true; m_showPointer = true; - repaint (); + tqrepaint (); } diff --git a/src/knutanalog.h b/src/knutanalog.h index bb754f9..719926b 100644 --- a/src/knutanalog.h +++ b/src/knutanalog.h @@ -60,14 +60,14 @@ public: * * When you need paint or repainr panel you have to call functiin reapaint * other functions calls this function theirself, when run = true - * Pokud je potreba vykreslit nebo prekreslit panel je nutno zavolat funkci repaint, + * Pokud je potreba vykreslit nebo prekreslit panel je nutno zavolat funkci tqrepaint, * ostatni funkce ji zavolaji sami pokud je run = TRUE. * * @param bottomLimit Is bottom value of scale.. * @param topLimit is end value of scale. * @param typeOfView determine type view of scale 1- circle 2- right part of circle, 3 - top part of circle * @param countOfParts determine count of big parts (parents parts) of scale. - * @param countOfSubParts determine count small parts (children parts) id scale, evere big part include e few small part. + * @param countOfSubParts determine count small parts (tqchildren parts) id scale, evere big part include e few small part. * @param pointerColor determine color of pointer. * @param scaleColor determine color of scale. * @param textColor determine color of text. @@ -91,7 +91,7 @@ public: * @param m_inscription determinuje inscription , bottom text , usually. * @param m_inscription Udava nadpis, "dolni" text, obvykle co je mereno. * @param text_up Udava mernou jednotku "horni" text, obvykle merna jednotka. - * @param run = TRUE makes immediately repaint of panel + * @param run = TRUE makes immediately tqrepaint of panel * @param run = TRUE provede okamzite prekresleni panelu. * * @since 0.1 @@ -103,7 +103,7 @@ public: * Makes background of analog panel. * Vytvori pozadi analogoveho panelu. * - * @param run = TRUE makes immediately repaint of panel + * @param run = TRUE makes immediately tqrepaint of panel * @param run = TRUE provede okamzite prekresleni panelu. * * @since 0.2 @@ -115,7 +115,7 @@ public: * Repaint pointer of analog panel. * Prekresli rucicku analogoveho panelu. * - * @param run = TRUE makes immediately repaint of panel + * @param run = TRUE makes immediately tqrepaint of panel * @param run = TRUE provede okamzite prekresleni panelu. * * @since 0.2 @@ -129,7 +129,7 @@ public: * Sets nine basic color for circle in scale * * @param run = TRUE provede okamzite prekresleni panelu. - * @param run = TRUE makes immediately repaint of panel + * @param run = TRUE makes immediately tqrepaint of panel * * @since 0.1 **/ @@ -158,7 +158,7 @@ public: * @param startOfCircle Urcuje zazatek mezikruzi. * @param endOfCircle Urcuje konec mezikruzi. * @param color Urcuje barvu. - * @param run = TRUE makes immediately repaint of panel + * @param run = TRUE makes immediately tqrepaint of panel * @param run = TRUE provede okamzite prekresleni panelu. * * @since 0.2 @@ -171,7 +171,7 @@ public: * Clear colors of scale * Zrusi vybarveni stupnice. * - * @param run = TRUE makes immediately repaint of panel + * @param run = TRUE makes immediately tqrepaint of panel * @param run = TRUE provede okamzite prekresleni panelu. * * @since 0.1 @@ -186,7 +186,7 @@ public: * * @param Astart Urcuje pocatecni hodnotu stupnice. * @param AEND Urcuje koncovou hodnotu stupnice. - * @param run = TRUE makes immediately repaint of panel + * @param run = TRUE makes immediately tqrepaint of panel * @param run = TRUE provede okamzite prekresleni panelu. * * @since 0.2 @@ -199,7 +199,7 @@ public: * * @param Count Determine number of parts of pointer.. * @param Count Urcuje pocet casti stupnice. - * @param run = TRUE makes immediately repaint of panel + * @param run = TRUE makes immediately tqrepaint of panel * @param run = TRUE provede okamzite prekresleni panelu. * * @since 0.1 @@ -212,7 +212,7 @@ public: * * @param pointerColor determine color of pointer. * @param pointerColor Urcuje barvu rucicky. - * @param run = TRUE makes immediately repaint of panel + * @param run = TRUE makes immediately tqrepaint of panel * @param run = TRUE provede okamzite prekresleni panelu. * @since 0.2 */ @@ -224,7 +224,7 @@ public: * * @param fontColor determine color of font. * @param fontColor urcuje barvu fontu. - * @param run = TRUE makes immediately repaint of panel + * @param run = TRUE makes immediately tqrepaint of panel * @param run = TRUE provede okamzite prekresleni panelu. * * @since 0.1 @@ -239,7 +239,7 @@ public: * * @param scaleColor determine color if scale. * @param scaleColor urcuje barvu stupnice. - * @param run = TRUE makes immediately repaint of panel + * @param run = TRUE makes immediately tqrepaint of panel * @param run = TRUE provede okamzite prekresleni panelu. * * @since 0.1 @@ -251,7 +251,7 @@ public: * Sets type of digital processing of pointer. 0 nothing. 1 fast antialiasing, 2 slow antialiasing, 3 blur motion + fast antialiasing, 4 blur motion + slow antialiasing. * * @param qualityOfPointer determine quality of pointer's digital procesing - * @param run = TRUE makes immediately repaint of panel + * @param run = TRUE makes immediately tqrepaint of panel * @param run = TRUE provede okamzite prekresleni panelu. * * @since 0.1 @@ -265,7 +265,7 @@ public: * Posune rucicku na hodnotu pointerValue. * * @param pointerValue Urcuje hodnotu na jakou bude nastavena rucicka. - * @param run = TRUE makes immediately repaint of panel + * @param run = TRUE makes immediately tqrepaint of panel * @param run = TRUE provede okamzite prekresleni panelu. * * @since 0.1 diff --git a/src/knutclient.cpp b/src/knutclient.cpp index 3c4adb1..935d1e1 100755 --- a/src/knutclient.cpp +++ b/src/knutclient.cpp @@ -90,7 +90,7 @@ KNutClient::KNutClient(bool noDock, TQObject* parent, const char *name) : TQObje // sets data for selected item setActiveUpsInfo(m_mainUpsInfo.record.name); - // sets mainUpsInfo.oldState to const value KNutNet::initStatus + // sets mainUpsInfo.oldState to const value KNutNet::inittqStatus m_mainUpsInfo.oldState=KNutNet::initState; @@ -281,7 +281,7 @@ void KNutClient::slotErrorConnection (int error) { m_mainUpsInfo.reconnectCount++; if (m_mainUpsInfo.reconnectCount > countNextConnDelay) m_mainUpsInfo.reconnectCount = countNextConnDelay; - addEventString(i18n("The connection failed. The next connection will make after %1 sec.").arg(nextConnDelay[m_mainUpsInfo.reconnectCount-1]),m_mainUpsInfo.record.name); + addEventString(i18n("The connection failed. The next connection will make after %1 sec.").tqarg(nextConnDelay[m_mainUpsInfo.reconnectCount-1]),m_mainUpsInfo.record.name); m_reconnectTimer->start( nextConnDelay[m_mainUpsInfo.reconnectCount-1]*1000, TRUE ); // starts reconnect timer again } else { @@ -715,7 +715,7 @@ void KNutClient::addEventString (const TQString text, const TQString UPSAddress) mainWindow->addComboStatusItem (text,UPSAddress); else { - TQString dateTime(TQDate::currentDate().toString()); + TQString dateTime(TQDate::tqcurrentDate().toString()); dateTime +=" " + TQTime::currentTime().toString(); if (UPSAddress.isEmpty()) m_listKNutEvent->append(dateTime+" "+text); else m_listKNutEvent->append(dateTime+" "+UPSAddress+" : "+text); @@ -791,7 +791,7 @@ void KNutClient::showStatusEvent(void) { //qDebug ("KNutClient::showStatusEvent"); - int myState = m_mainUpsInfo.upsNet->readStatus(); + int myState = m_mainUpsInfo.upsNet->readtqStatus(); if (myState != m_mainUpsInfo.oldState) { if ((myState & KNutNet::OFF) != (m_mainUpsInfo.oldState & KNutNet::OFF)) { @@ -1096,7 +1096,7 @@ void KNutClient::slotRefreshConnection(void) { if (m_myDock) { m_myDock->clearDockValues(); // myDock->initImage(); - // myDock->repaint(); + // myDock->tqrepaint(); } if (mainWindow) { mainWindow->cleanPanels(); diff --git a/src/knutclient.h b/src/knutclient.h index 9498876..39106f2 100755 --- a/src/knutclient.h +++ b/src/knutclient.h @@ -96,7 +96,7 @@ class KNutClient : public TQObject, public KSessionManaged { /** * Nastavi hodnoty po prvem pripojeni na UPS, zavola prekresleni docku a nastartuje timer - * Sets values after the first conection to UPS ,calls to repaint of dock and starts timer + * Sets values after the first conection to UPS ,calls to tqrepaint of dock and starts timer * * @since 0.2 **/ diff --git a/src/knutdock.cpp b/src/knutdock.cpp index bb1f6e1..a404221 100755 --- a/src/knutdock.cpp +++ b/src/knutdock.cpp @@ -152,7 +152,7 @@ void KNutDock::changeKIcon (void) { if (!m_runtimeLayer) { m_runtimeLayer = new TQPixmap(ICON_SIZE,ICON_SIZE); } - paintStatus(m_statusValue); + painttqStatus(m_statusValue); paintRuntime(m_runtimeValue, m_statusValue); } else { // picture Icon @@ -195,7 +195,7 @@ void KNutDock::repaintDock (const bool always) { TQPainter paint; - if (m_activeUpsInfo->upsNet == 0) { repaint(); return;} + if (m_activeUpsInfo->upsNet == 0) { tqrepaint(); return;} m_dataOkOld=m_dataOk; @@ -215,7 +215,7 @@ void KNutDock::repaintDock (const bool always) { } else myRuntimeValue = knc::numberVarError; - myStatusValue = m_activeUpsInfo->upsNet->readStatus(); + myStatusValue = m_activeUpsInfo->upsNet->readtqStatus(); switch (m_typeOfIcon) { @@ -223,14 +223,14 @@ void KNutDock::repaintDock (const bool always) { // *********STATUS**************** if (myStatusValue !=m_statusValue ) { m_statusValue = myStatusValue; - paintStatus(m_statusValue); + painttqStatus(m_statusValue); repaintNow = true; } // **********RUNTIME*********** myStatusBatValue = myStatusValue & KNutNet::OB; // OB = UPS runs on battery if ((myRuntimeValue != m_runtimeValue) || (myStatusBatValue != m_statusBatValue)) { - // when runtime is changed or flags OB is changed we must repaint icons + // when runtime is changed or flags OB is changed we must tqrepaint icons // when OB is changed same items in icon will change color m_runtimeValue = myRuntimeValue; // runtime is old value of runtime, one is defined like global value of class m_statusBatValue = myStatusBatValue; @@ -390,7 +390,7 @@ void KNutDock::repaintDock (const bool always) { } } } - repaint(); + tqrepaint(); } @@ -483,17 +483,17 @@ void KNutDock::toolTip (int runtime, int status, int batteryCharge, int upsLoad if (m_toolTipFlags & TTRun) { if (runtime != knc::numberVarError) - text += "\n" + i18n("Runtime") + i18n(" : %1:%2 min").arg(min).arg(sec); + text += "\n" + i18n("Runtime") + i18n(" : %1:%2 min").tqarg(min).tqarg(sec); } if (m_toolTipFlags & TTCharge) { if (batteryCharge != knc::numberVarError) - text += "\n" + i18n("Battery Charge") + TQString(" : %1 %").arg(batteryCharge); + text += "\n" + i18n("Battery Charge") + TQString(" : %1 %").tqarg(batteryCharge); } if (m_toolTipFlags & TTLoad) { if (upsLoad != knc::numberVarError) - text += "\n" + i18n("UPS Load") + TQString(" : %1 %").arg(upsLoad); + text += "\n" + i18n("UPS Load") + TQString(" : %1 %").tqarg(upsLoad); } TQToolTip::remove(this); @@ -726,7 +726,7 @@ void KNutDock::paintOKPoint (TQPainter& paint ) { } -void KNutDock::paintStatus (int status ) { +void KNutDock::painttqStatus (int status ) { TQPainter paint; int lastPos = 0; diff --git a/src/knutdock.h b/src/knutdock.h index c9fc2cc..93b46cf 100755 --- a/src/knutdock.h +++ b/src/knutdock.h @@ -138,9 +138,9 @@ class KNutDock : public KSystemTray { void changeToolTip(void); /** - * Provede nove zpracovani dat a jejich nakresli iconu docku, interni repaint je volan vzdy. + * Provede nove zpracovani dat a jejich nakresli iconu docku, interni tqrepaint je volan vzdy. * Tato funkce take vola funkci ToolTip. - * Makes new processing of data and paints icons of dock, internal repaint is colled always. + * Makes new processing of data and paints icons of dock, internal tqrepaint is colled always. * This function calls function ToolTips too. * @param always Kdyz je true prorovede vykresleni vzdy, kde je false provede vykresleni jen kdyz je zmenena nejaka hodnota UPS. * @param always When param is true, icon is made always, is one is false icon is makeing when same UPS's value is changed. @@ -443,12 +443,12 @@ class KNutDock : public KSystemTray { /** * @internal - * Paints layer for UPS Status, only for type general - * Vykresli vrstvu pro UPS Status. + * Paints layer for UPS tqStatus, only for type general + * Vykresli vrstvu pro UPS tqStatus. * * @since 0.2 **/ - void paintStatus (int status ); + void painttqStatus (int status ); void paintEvent (TQPaintEvent *); diff --git a/src/knutfrontpanel.cpp b/src/knutfrontpanel.cpp index 26bad61..5c5a1f2 100755 --- a/src/knutfrontpanel.cpp +++ b/src/knutfrontpanel.cpp @@ -26,13 +26,13 @@ #include #include #include -#include +#include #include //#include #include #include #include -#include +#include #include #include @@ -465,7 +465,7 @@ void KNutFrontPanel::setRuntime(const int runtime) { if (runtime != knc::numberVarError) { int min = (int)floor(runtime/60); int sec = runtime - (min*60); - runtimeString=TQString("%1:%2").arg(min,2).arg(sec,2); + runtimeString=TQString("%1:%2").tqarg(min,2).tqarg(sec,2); if (runtimeString[3] == ' ') runtimeString[3]='0'; } else runtimeString="-:--"; @@ -615,7 +615,7 @@ void KNutFrontPanel::setAllPalettes (void){ m_frameOL->setPalette(m_bulbsPalette); - // we must correct feature of KLed, KLed repaint background when color of item (function KLed::setColor()) is changed only + // we must correct feature of KLed, KLed tqrepaint background when color of item (function KLed::setColor()) is changed only // when we change palette backround only, KLed ignore this change myColor = m_frameOL->color(); diff --git a/src/knutinstcomms.cpp b/src/knutinstcomms.cpp index 72db0fb..b9e0d0a 100755 --- a/src/knutinstcomms.cpp +++ b/src/knutinstcomms.cpp @@ -23,7 +23,7 @@ #include -#include +#include #include #include #include @@ -43,7 +43,7 @@ KNutInstComms::KNutInstComms(TQString* userName, TQString* userPassword, const T TQFrame *page = plainPage(); TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); TQLabel *label1 = new TQLabel (i18n("RUN INSTANT COMMAND"),page,"label1"); - label1->setAlignment(TQt::AlignHCenter); + label1->tqsetAlignment(TQt::AlignHCenter); topLayout->addWidget(label1); TQLabel *label2 = new TQLabel (i18n("Command:"),page,"label2"); diff --git a/src/knutmainwindow.cpp b/src/knutmainwindow.cpp index 363762a..5b1aa49 100644 --- a/src/knutmainwindow.cpp +++ b/src/knutmainwindow.cpp @@ -29,12 +29,12 @@ #include -#include -#include +#include +#include #include #include #include -#include +#include #include #include #include @@ -150,7 +150,7 @@ void KNutMainWindow::addComboStatusItem (const TQString text, const TQString nam if (m_infoCombo->count() >= (int)knc::maxCountKNutEvent) m_infoCombo->removeItem(0); if (m_listKNutEvent->count() > knc::maxCountKNutEvent) m_listKNutEvent->remove(m_listKNutEvent->begin()); - TQString dateTime(TQDate::currentDate().toString()); + TQString dateTime(TQDate::tqcurrentDate().toString()); dateTime +=" " + TQTime::currentTime().toString(); if (name.isEmpty()) { m_infoCombo->insertItem(dateTime+" "+text); @@ -195,14 +195,14 @@ void KNutMainWindow::setConfig (unsigned int changeSetting) { if (!m_settingData->customBColor) { // nastavime barvu pozadi podle systemu m_area->setPalette (m_mainPalette); // we set background color based on system m_panelMeter->setPalette (m_mainPalette); - repaint(); + tqrepaint(); } else { m_areaPalette.setColor(TQPalette::Active,TQColorGroup::Background,m_settingData->mainBackgroundColor); m_areaPalette.setColor(TQPalette::Inactive,TQColorGroup::Background,m_settingData->mainBackgroundColor); m_area->setPalette (m_areaPalette); m_panelMeter->setPalette (m_areaPalette); - repaint(); + tqrepaint(); } } else { @@ -211,7 +211,7 @@ void KNutMainWindow::setConfig (unsigned int changeSetting) { m_areaPalette.setColor(TQPalette::Inactive,TQColorGroup::Background,m_settingData->mainBackgroundColor); m_area->setPalette (m_areaPalette); m_panelMeter->setPalette (m_areaPalette); - repaint(); + tqrepaint(); } } @@ -369,7 +369,7 @@ void KNutMainWindow::showUpsData (void) { int runtimeVal; TQString nutStringVar; bool okFloat; -// activeUpsInfo->oldStatus=KNutNet::initStatus; +// activeUpsInfo->oldtqStatus=KNutNet::inittqStatus; // Nastaveni nemenych dat jsou precteny pouze jednou, predpoklada se jejich nemenost // setting of unchange data, ones are reading only one. @@ -414,9 +414,9 @@ void KNutMainWindow::showUpsData (void) { m_existLowHighXfer = true; } } - int upsStatus=0; - if ((upsStatus = m_activeUpsInfo->upsNet->readStatus ()) != -1) - m_frontPanel->setPanel(upsStatus); + int upstqStatus=0; + if ((upstqStatus = m_activeUpsInfo->upsNet->readtqStatus ()) != -1) + m_frontPanel->setPanel(upstqStatus); if ( !m_activeUpsInfo->upsNet->existName(m_activeUpsInfo->runtimeVar)) { nutStringVar = m_activeUpsInfo->upsNet->readStringVar(m_activeUpsInfo->runtimeVar); @@ -456,7 +456,7 @@ void KNutMainWindow::showUpsData (void) { m_panelMeter->setSize(true); //qDebug ("KNutMainWindow::showUpsData 3"); m_mainSplit->refresh(); - // doesn't repaint analog pointers, because pointers will be repainted twice + // doesn't tqrepaint analog pointers, because pointers will be repainted twice //qDebug ("KNutMainWindow::showUpsData 4"); // repaintAnalogs(false); // don't make this //qDebug ("KNutMainWindow::showUpsData 5"); @@ -494,7 +494,7 @@ void KNutMainWindow::repaintPanel (void) { } else m_frontPanel->setRuntime(knc::numberVarError); // precteme status a nastavime zarovky panelu - int status = m_activeUpsInfo->upsNet->readStatus(); + int status = m_activeUpsInfo->upsNet->readtqStatus(); m_frontPanel->setPanel(status); } @@ -727,7 +727,7 @@ void KNutMainWindow::initToolBar ( void ) { TQLabel *upsNazev = new TQLabel ("UPS : ",toolBar("mainToolBar")); // upsNazev is connected on toolBaar, dosn't need to call desctructor - toolBar ("mainToolBar")->insertWidget (0,upsNazev->sizeHint().width(),upsNazev); + toolBar ("mainToolBar")->insertWidget (0,upsNazev->tqsizeHint().width(),upsNazev); toolBar ("mainToolBar")->insertCombo("",1,false, TQT_SIGNAL (activated (const TQString &)),TQT_TQOBJECT(this), TQT_SLOT (slotChangeUPS (const TQString &))); // bude se pouze vybirat-------------------^^^ KComboBox *combo = toolBar("mainToolBar")->getCombo(1); diff --git a/src/knutmainwindow.h b/src/knutmainwindow.h index 47829a9..1714010 100644 --- a/src/knutmainwindow.h +++ b/src/knutmainwindow.h @@ -100,7 +100,7 @@ class KNutMainWindow : public KMainWindow { /** * Repaints analog panels based on their status. * Prekresli analogove panely na zaklade jejich stavu. - * @param run = TRUE makes immediately repaint of panel + * @param run = TRUE makes immediately tqrepaint of panel * * @since 0.3.1 **/ @@ -109,8 +109,8 @@ class KNutMainWindow : public KMainWindow { /** * Da prikaz k prekresleni analogovych panelu, hlavniho panelu a nastavi jejich hodnoty na * zaklade XFer hodnot. - * Give command to repaint analog panels, main panel and sets their values based on XFer values - * @param run = TRUE makes immediately repaint of analog panels + * Give command to tqrepaint analog panels, main panel and sets their values based on XFer values + * @param run = TRUE makes immediately tqrepaint of analog panels * * @since 0.3.1 **/ diff --git a/src/knutmessage.cpp b/src/knutmessage.cpp index 95e250a..1c69e82 100644 --- a/src/knutmessage.cpp +++ b/src/knutmessage.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/knutmessagemanager.h b/src/knutmessagemanager.h index 10f66cf..9d581ae 100644 --- a/src/knutmessagemanager.h +++ b/src/knutmessagemanager.h @@ -33,7 +33,7 @@ enum LevelOfMessage { lowWarningLevel, // OVER, warningLevel, // OB .. errorLevel, // connection error - criticalLevel // Status BL, OFF + criticalLevel // tqStatus BL, OFF }; } diff --git a/src/knutnet.cpp b/src/knutnet.cpp index 7dd76ff..ee509e5 100755 --- a/src/knutnet.cpp +++ b/src/knutnet.cpp @@ -17,7 +17,7 @@ #include "knutnet.h" -#include +#include #include #include #include @@ -201,7 +201,7 @@ int KNutNet::getUpsVars ( void) { default: return 0; } - if ( readStatus() != KNutNet::WAIT) return returnValue; + if ( readtqStatus() != KNutNet::WAIT) return returnValue; countWaitRevision--; if (countWaitRevision) sleep (2); } @@ -474,7 +474,7 @@ TQString KNutNet::readEnumValueVar (const TQString name, const int valueNumber) } -int KNutNet::readStatus(void) { +int KNutNet::readtqStatus(void) { m_error=0; return m_upsStatusVar; diff --git a/src/knutnet.h b/src/knutnet.h index 56e13ab..f15ce4e 100755 --- a/src/knutnet.h +++ b/src/knutnet.h @@ -145,7 +145,7 @@ public: // this not error NoListVars}; //upsd doesn't return list of variables, variable for STATUS has got value WAIT - enum typeOfStatus { + enum typeOftqStatus { NS = 0, // - NONE status of UPS wasn't read OFF = 1, // - UPS is off (not supplying power) OL = 2, // - UPS is online (supplying power from the line/mains) @@ -481,7 +481,7 @@ bool switchedToTCP ( void ); * * @since 0.5 **/ -int readStatus(void); +int readtqStatus(void); /** diff --git a/src/knutnewupsdlg.cpp b/src/knutnewupsdlg.cpp index b2ef73d..52d2192 100644 --- a/src/knutnewupsdlg.cpp +++ b/src/knutnewupsdlg.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include @@ -95,7 +95,7 @@ KNutNewUpsDlg::KNutNewUpsDlg (KNutUpsData* const upsData, KNutVarData* const ana TQLabel* TextLabel4 = new TQLabel(i18n("Port:"), hostBox, "TextLabel4" ); m_lineEdit4 = new KLineEdit( hostBox, "LineEdit4" ); - m_lineEdit4->setText(TQString("%1").arg(knc::DefaultPort)); + m_lineEdit4->setText(TQString("%1").tqarg(knc::DefaultPort)); portLayout->addWidget(TextLabel4); portLayout->addWidget(m_lineEdit4); diff --git a/src/knutpanelmeter.cpp b/src/knutpanelmeter.cpp index ab0d507..60a6c52 100644 --- a/src/knutpanelmeter.cpp +++ b/src/knutpanelmeter.cpp @@ -19,7 +19,7 @@ #include -#include +#include #include #include @@ -154,9 +154,9 @@ void KNutPanelMeter::activateAnalogs (void) { } //qDebug ( "KNutPanelMeter::activateAnalogs 1" ); - m_analogArea->repaint(); //repaint all analog panels, background was made already + m_analogArea->tqrepaint(); //tqrepaint all analog panels, background was made already //qDebug ("KNutPanelMeter::activateAnalogs - end"); -// analogSV->resizeContents(sizeHint().width(),sizeHint().height()); +// analogSV->resizeContents(tqsizeHint().width(),tqsizeHint().height()); } @@ -189,7 +189,7 @@ void KNutPanelMeter::setSize (bool showPanels) { m_analogArea->setMinimumSize (m_widthArea,m_heightArea); adjustSize(); resizeContents(m_widthArea,m_heightArea); - repaint(); + tqrepaint(); } void KNutPanelMeter::repaintScaleAnalogPanel (int panelNumber, float value) { @@ -229,7 +229,7 @@ void KNutPanelMeter::repaintScaleAnalogPanel (int panelNumber, float value) { m_analogPanels->upsAnalogs[panelNumber]->setPointer(value); // jistota pokud by nam to nekde propadlo m_analogPanels->upsAnalogs[panelNumber]->hide();// schovame analogovy panel hides analog panel m_analogPanels->upsAnalogs[panelNumber]->setRange (m_analogPanels->scaleStart[panelNumber],m_analogPanels->scaleEnd[panelNumber]); - m_analogPanels->upsAnalogs[panelNumber]->repaint(); // prekreslime , repaints panel + m_analogPanels->upsAnalogs[panelNumber]->tqrepaint(); // prekreslime , repaints panel m_analogPanels->upsAnalogs[panelNumber]->show(); //zobrazime merak shows analog panel } } @@ -299,7 +299,7 @@ KNutVarData::VarStrucDef analogMemberData; m_analogPanels->upsAnalogs[i]->makeBackground(false); // repaints analog meter m_analogPanels->upsAnalogs[i]->repaintPointer(false); // repaints analog meter - m_analogPanels->upsAnalogs[i]->repaint(); // repaints analog meter + m_analogPanels->upsAnalogs[i]->tqrepaint(); // repaints analog meter m_analogPanels->upsAnalogs[i]->show(); // shows analog meter } // end if (((activeUpsInfo if (repaintAllPanels) { @@ -334,7 +334,7 @@ void KNutPanelMeter::zeroingPanels (void) { -TQSize KNutPanelMeter::sizeHint (void){ +TQSize KNutPanelMeter::tqsizeHint (void){ return TQSize(m_widthArea,m_heightArea); } diff --git a/src/knutpanelmeter.h b/src/knutpanelmeter.h index 7f5433c..d46c781 100644 --- a/src/knutpanelmeter.h +++ b/src/knutpanelmeter.h @@ -98,7 +98,7 @@ public: * * @param panelNumber is number of analog panel. * @param value is value of settimg amalog panel. - * @param run = TRUE makes immediately repaint of panel + * @param run = TRUE makes immediately tqrepaint of panel * @param panelNumber je cislo analogoveho panelu. * @param value je hodnota na kterou je panel nastaven. * @param run = TRUE provede okamzite prekresleni @@ -161,7 +161,7 @@ public: * * @since 0.1 **/ - virtual TQSize sizeHint (void); + virtual TQSize tqsizeHint (void); public slots: diff --git a/src/knutprefdlg.cpp b/src/knutprefdlg.cpp index 91474c8..e440380 100644 --- a/src/knutprefdlg.cpp +++ b/src/knutprefdlg.cpp @@ -22,7 +22,7 @@ #include -#include +#include #include #include #include @@ -210,7 +210,7 @@ void KNutPrefDlg::slotNewUps () { // pridame data do okenka m_listBox2->insertItem(upsRecord.name); // pokud pridame prvni prekreslime hlavni okno - // when adds the first sameone, will repaint window + // when adds the first sameone, will tqrepaint window m_checked = true; if (m_myUpsData->getCount() ==1 ) m_checkedActiveUps = true; } @@ -630,16 +630,16 @@ void KNutPrefDlg::initUps () { // makes box for names of UPS's / Vytvorime box pro jmena UPS-ek m_listBox2 = new KListBox( page, "ListBox2" ); - m_listBox2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, m_listBox2->sizePolicy().hasHeightForWidth() ) ); + m_listBox2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, m_listBox2->sizePolicy().hasHeightForWidth() ) ); m_listBox2->setFrameShape( TQListBox::StyledPanel ); m_listBox2->setFrameShadow( TQListBox::Sunken ); m_listBox2->setMinimumSize (100,100); // sets listbox for (int i=0; i < m_myUpsData->getCount (); i++) m_listBox2->insertItem (m_myUpsData->getName(i)); - //includes listbox into horizontal layout on the first place + //includes listbox into horizontal tqlayout on the first place upsTopLayout->addWidget( m_listBox2, 20 ); - // makes vertical layout and includes it in horizontal layout into the second place + // makes vertical tqlayout and includes it in horizontal tqlayout into the second place TQVBoxLayout *upsLayout = new TQVBoxLayout( upsTopLayout, spacingHint (),"upsLayout" ); // vytvorime tlacitka @@ -647,7 +647,7 @@ void KNutPrefDlg::initUps () { KPushButton *editButton = new KPushButton (i18n("&Edit"),page); KPushButton *deleteButton = new KPushButton (i18n("&Delete"),page); - // includes buttons into layout / vlozime tlacitka do layoutu + // includes buttons into tqlayout / vlozime tlacitka do layoutu upsLayout->addWidget( newButton ); upsLayout->addWidget( editButton ); upsLayout->addWidget( deleteButton ); diff --git a/src/knutprintupsvar.h b/src/knutprintupsvar.h index 2d90074..404d330 100755 --- a/src/knutprintupsvar.h +++ b/src/knutprintupsvar.h @@ -31,7 +31,7 @@ #include -#include +#include #include diff --git a/src/knutrwvar.cpp b/src/knutrwvar.cpp index feca8c8..3d904eb 100755 --- a/src/knutrwvar.cpp +++ b/src/knutrwvar.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include //#include @@ -54,7 +54,7 @@ KNutRWVar::KNutRWVar(TQString* userName, TQString* userPassword, const TQString TQFrame *page = plainPage(); TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); TQLabel *label1 = new TQLabel (i18n("SET RW VARIABLE"),page,"label1"); - label1->setAlignment(TQt::AlignHCenter); + label1->tqsetAlignment(TQt::AlignHCenter); topLayout->addWidget(label1); @@ -191,7 +191,7 @@ void KNutRWVar::slotOk() { if (!(error = m_upsNet->setVariable(m_rWVarBox->currentText(), value, m_lineEditName->text(),m_lineEditPassword->text(),false))) { // vzhledem k asynchronimu spracovani asi zbytecne // myUpsNet->getUpsValues(true); - emit signalChangeRWVars(m_rWVarBox->currentText());//emits command for loading of variable and repaint of panel + emit signalChangeRWVars(m_rWVarBox->currentText());//emits command for loading of variable and tqrepaint of panel (*m_oldUserName) = m_lineEditName->text(); (*m_oldUserPassword) = m_lineEditPassword->text(); @@ -204,7 +204,7 @@ void KNutRWVar::slotOk() { // next line isn't needed, maybe // vzhledem k asynchronimu spracovani asi zbytecne // myUpsNet->getUpsValues(true); - emit signalChangeRWVars(m_rWVarBox->currentText()); //emits command for loading of variable and repaint of panel + emit signalChangeRWVars(m_rWVarBox->currentText()); //emits command for loading of variable and tqrepaint of panel accept(); } }