summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-07 21:14:06 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-07 21:14:06 +0000
commit41f66dea058c2d1e2dc882c8264592443ac479a1 (patch)
tree38c723079b3d8b62a6300a1298dcf716f74f1bf1
parent968af1d235ac30d737991b269156bee5dc99d318 (diff)
downloadknutclient-41f66dea.tar.gz
knutclient-41f66dea.zip
Rename incorrect instances of tqrepaint[...] to repaint[...]
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/knutclient@1240369 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--src/knutanalog.cpp4
-rw-r--r--src/knutanalog.h6
-rwxr-xr-xsrc/knutclient.cpp30
-rwxr-xr-xsrc/knutclient.h4
-rwxr-xr-xsrc/knutdock.cpp32
-rwxr-xr-xsrc/knutdock.h2
-rw-r--r--src/knutmainwindow.cpp54
-rw-r--r--src/knutmainwindow.h4
-rw-r--r--src/knutpanelmeter.cpp24
-rw-r--r--src/knutpanelmeter.h14
10 files changed, 87 insertions, 87 deletions
diff --git a/src/knutanalog.cpp b/src/knutanalog.cpp
index 8469738..c894768 100644
--- a/src/knutanalog.cpp
+++ b/src/knutanalog.cpp
@@ -259,7 +259,7 @@ void KNutAnalog::setPointerColor (TQColor pointerColor, bool run ) {
}
-void KNutAnalog::tqrepaintPointer ( bool run ) {
+void KNutAnalog::repaintPointer ( bool run ) {
paintPointer();
m_showPointer = true;
@@ -356,7 +356,7 @@ void KNutAnalog::slotSetAllFont(TQFont newAllFont){
}
-void KNutAnalog::tqrepaintAll (void) {
+void KNutAnalog::repaintAll (void) {
paintBackGround();
m_showBackGround = true;
m_showPointer = true;
diff --git a/src/knutanalog.h b/src/knutanalog.h
index 97d9c81..2496248 100644
--- a/src/knutanalog.h
+++ b/src/knutanalog.h
@@ -120,7 +120,7 @@ public:
*
* @since 0.2
**/
- void tqrepaintPointer ( bool run );
+ void repaintPointer ( bool run );
@@ -319,13 +319,13 @@ public:
/**
* Repaint layer of backgroud and layer of pointer,
- * all panel will be tqrepainted
+ * all panel will be repainted
* Da povel k prekreseni urovne pozadi a urovne rucicky.
* To znamena, ze bude prekreslen kompletne cely panel.
*
* @since 0.1
*/
- void tqrepaintAll (void);
+ void repaintAll (void);
protected:
diff --git a/src/knutclient.cpp b/src/knutclient.cpp
index c0d262f..b146e0e 100755
--- a/src/knutclient.cpp
+++ b/src/knutclient.cpp
@@ -112,7 +112,7 @@ KNutClient::KNutClient(bool noDock, TQObject* tqparent, const char *name) : TQOb
// }
// else mainUpsInfo.upsDriverState=knc::notConnected;
- // tqrepaints the dock
+ // repaints the dock
if (m_myDock) m_myDock->clearDockValues();
if (settingData.useMainWindow == KNutVarData::mw_yes || noDock ||
@@ -154,8 +154,8 @@ void KNutClient::slotTryFirstConnection (int maxCount) {
//qDebug ("KNutClient::slotTryFirstConnection");
//knutNet begin the first test of connection (connectToHost will be made after emiting signal tryFirstConnection )
-// tqrepaints icon
- if (m_myDock) m_myDock->tqrepaintDock(true);
+// repaints icon
+ if (m_myDock) m_myDock->repaintDock(true);
if (mainWindow) mainWindow->startConnectPB(maxCount);
}
@@ -206,7 +206,7 @@ void KNutClient::slotFirstConnection (void) {
else
m_mainUpsInfo.upsDriverState=knc::error;
- if (m_myDock) m_myDock->tqrepaintDock(true);
+ if (m_myDock) m_myDock->repaintDock(true);
addEventString (KNutVarData::errorToText(m_mainUpsInfo.netError),m_mainUpsInfo.record.name);
// KNutVarData::showError (mainUpsInfo.netError);
if ((m_myMessMan)) m_myMessMan->addMessage(KNutVarData::errorToText(m_mainUpsInfo.netError),knc::errorLevel,true);
@@ -247,10 +247,10 @@ void KNutClient::slotFirstConnection (void) {
if (mainWindow) setActiveUpsVars(true);
else setActiveUpsVars(false);
- // tqrepaints main window and dock immediately
+ // repaints main window and dock immediately
if (mainWindow) mainWindow->showUpsData();
-// if (myDock) myDock->tqrepaintDock(mainUpsInfo.netError,true); // dock is tqrepainting always
- if (m_myDock) m_myDock->tqrepaintDock(true); // dock is tqrepainting always
+// if (myDock) myDock->repaintDock(mainUpsInfo.netError,true); // dock is repainting always
+ if (m_myDock) m_myDock->repaintDock(true); // dock is repainting always
m_panelsAreZeroing=false; // analog panels isn't setting to zero
}
@@ -274,7 +274,7 @@ void KNutClient::slotErrorConnection (int error) {
m_mainUpsInfo.upsDriverState=knc::notConnected;
else
m_mainUpsInfo.upsDriverState=knc::error;
- if (m_myDock) m_myDock->tqrepaintDock(true);
+ if (m_myDock) m_myDock->repaintDock(true);
if (m_mainUpsInfo.reconnecting) {
//qDebug ("KNutClient::slotErrorConnection (2)");
@@ -744,8 +744,8 @@ void KNutClient::slotTimeout (void) {
getUpsData();
if (!m_mainUpsInfo.errorUpsData) { // no error
if (mainWindow) {
- mainWindow->tqrepaintPanel();
- mainWindow->tqrepaintAnalogs();
+ mainWindow->repaintPanel();
+ mainWindow->repaintAnalogs();
}
m_panelsAreZeroing=false;
showStatusEvent();
@@ -755,7 +755,7 @@ void KNutClient::slotTimeout (void) {
m_panelsAreZeroing=true;
if (m_myDock) m_myDock->clearDockValues();
}
- if (m_myDock) m_myDock->tqrepaintDock();
+ if (m_myDock) m_myDock->repaintDock();
m_upsTimer->start( m_mainUpsInfo.record.delay, TRUE ); // nastartujem znovu
}
@@ -978,7 +978,7 @@ void KNutClient::slotSetConfig (unsigned int changeSetting) {
// showUpsData je nutno udelat take proto ze se mohl zmenit vyber meraku
// if (mainWindow) mainWindow->showUpsData();
if (mainWindow) mainWindow->cleanPanels();
-// if (myDock) myDock->tqrepaintDock(mainUpsInfo.netError);
+// if (myDock) myDock->repaintDock(mainUpsInfo.netError);
if (m_myDock) m_myDock->clearDockValues();
m_mainUpsInfo.upsNet->newUPS(m_mainUpsInfo.record.upsAddress,m_mainUpsInfo.record.upsName, m_mainUpsInfo.record.port);
@@ -1179,7 +1179,7 @@ void KNutClient::slotActiveMainWindow (void) {
setActiveUpsVars(true);
getUpsData();
makeMainWindow();
- if (m_myDock) m_myDock->tqrepaintDock(m_mainUpsInfo.netError);
+ if (m_myDock) m_myDock->repaintDock(m_mainUpsInfo.netError);
m_upsTimer->start( 1, TRUE ); // nastartujem znovu
// 1 proto aby se zpracovali pripadne udalosti o zruseni spojeni
}
@@ -1189,7 +1189,7 @@ void KNutClient::slotActiveMainWindow (void) {
// getValues error=0 a doslo by vypsani data ok.
makeMainWindow();
if (!m_mainUpsInfo.errorUpsData) {
- if (m_myDock) m_myDock->tqrepaintDock(m_mainUpsInfo.netError);
+ if (m_myDock) m_myDock->repaintDock(m_mainUpsInfo.netError);
}
}
}
@@ -1206,7 +1206,7 @@ void KNutClient::slotSaveConf (void) {
void KNutClient::closeMainWindow (void) {
if (mainWindow) {
- if (m_myDock) m_myDock->tqrepaintDock(m_mainUpsInfo.netError);
+ if (m_myDock) m_myDock->repaintDock(m_mainUpsInfo.netError);
m_upsTimer->stop();
mainWindow->close();
mainWindow=0;
diff --git a/src/knutclient.h b/src/knutclient.h
index 9b3da33..6d490a7 100755
--- a/src/knutclient.h
+++ b/src/knutclient.h
@@ -74,7 +74,7 @@ class KNutClient : public TQObject, public KSessionManaged {
/**
*
- * Calls function for tqrepainting of icon in dock.
+ * Calls function for repainting of icon in dock.
* Vola funkci pro prekresleni icony v doku.
*
* @since 0.1
@@ -85,7 +85,7 @@ class KNutClient : public TQObject, public KSessionManaged {
/**
* This function is called when program repeats other connection;
- * Calls function for tqrepainting of icon in dock.
+ * Calls function for repainting of icon in dock.
* Tata funkce je volana, kdyz program opakuje pokus o pripojeni.
* Vola funkci pro prekresleni icony v doku.
*
diff --git a/src/knutdock.cpp b/src/knutdock.cpp
index ed5204a..2be630c 100755
--- a/src/knutdock.cpp
+++ b/src/knutdock.cpp
@@ -82,7 +82,7 @@ KNutDock::KNutDock(KNutVarData::upsInfoDef* activeUpsInfo, KNutVarData::SettingD
initImage();
- changeKIcon(); // this function calls function tqrepaintIcon
+ changeKIcon(); // this function calls function repaintIcon
}
@@ -102,7 +102,7 @@ KNutDock::~KNutDock(){
void KNutDock::resizeEvent ( TQResizeEvent * ){
initImage();
- changeKIcon(); // this function calls function tqrepaintIcon
+ changeKIcon(); // this function calls function repaintIcon
}
void KNutDock::changeUps (void) {
@@ -117,7 +117,7 @@ void KNutDock::clearDockValues(void){
initImage(); // paints standart icon
clearValues();
- tqrepaintDock(true);
+ repaintDock(true);
}
@@ -133,7 +133,7 @@ void KNutDock::changeKIBColor(void) {
if (!m_settingData->customKIconColor) m_myBGColor = backgroundColor;
else m_myBGColor = m_settingData->kIconBackgroundColor; // uses defined color
- tqrepaintDock(true);
+ repaintDock(true);
}
void KNutDock::changeKIcon (void) {
@@ -166,7 +166,7 @@ void KNutDock::changeKIcon (void) {
m_statusWarningValue = m_statusValue & (KNutNet::CAL | KNutNet::TRIM | KNutNet::BOOST
| KNutNet::OVER | KNutNet::RB);
- tqrepaintDock(true);
+ repaintDock(true);
}
void KNutDock::initImage(void) {
@@ -181,15 +181,15 @@ void KNutDock::setNewUPS(void) {
}
-void KNutDock::tqrepaintDock (const bool always) {
+void KNutDock::repaintDock (const bool always) {
TQString nutStringVar;
int myRuntimeValue;
int myUpsLoadValue;
int myStatusValue;
int myStatusBatValue;
int myBatteryChargeValue;
- bool tqrepaintNow = false;
- // value tqrepaintNow is seted when some ups values are changed
+ bool repaintNow = false;
+ // value repaintNow is seted when some ups values are changed
bool okFloat;
TQString valueName;
TQPainter paint;
@@ -206,7 +206,7 @@ void KNutDock::tqrepaintDock (const bool always) {
if (!m_activeUpsInfo->upsNet->existName(m_activeUpsInfo->runtimeVar)) {
nutStringVar = m_activeUpsInfo->upsNet->readStringVar(m_activeUpsInfo->runtimeVar);
-//std::cout << "KNutDock::tqrepaintDock RUNTIME " << nutStringVar << std::endl;
+//std::cout << "KNutDock::repaintDock RUNTIME " << nutStringVar << std::endl;
if (nutStringVar.isEmpty()) myRuntimeValue=knc::numberVarError;
else {
myRuntimeValue = (int)nutStringVar.toFloat(&okFloat);
@@ -224,7 +224,7 @@ void KNutDock::tqrepaintDock (const bool always) {
if (myStatusValue !=m_statusValue ) {
m_statusValue = myStatusValue;
painttqStatus(m_statusValue);
- tqrepaintNow = true;
+ repaintNow = true;
}
// **********RUNTIME***********
@@ -235,7 +235,7 @@ void KNutDock::tqrepaintDock (const bool always) {
m_runtimeValue = myRuntimeValue; // runtime is old value of runtime, one is defined like global value of class
m_statusBatValue = myStatusBatValue;
paintRuntime(m_runtimeValue, m_statusValue);
- tqrepaintNow = true;
+ repaintNow = true;
}
break;
@@ -245,13 +245,13 @@ void KNutDock::tqrepaintDock (const bool always) {
m_statusValue = myStatusValue;
m_statusWarningValue = myStatusValue & (KNutNet::CAL | KNutNet::TRIM | KNutNet::BOOST
| KNutNet::OVER | KNutNet::RB);
- tqrepaintNow = true;
+ repaintNow = true;
}
// **********RUNTIME***********
if (myRuntimeValue != m_runtimeValue) {
m_runtimeValue = myRuntimeValue;
- tqrepaintNow = true;
+ repaintNow = true;
}
break;
} ///////////////////// end of models
@@ -274,7 +274,7 @@ void KNutDock::tqrepaintDock (const bool always) {
if (myUpsLoadValue != m_upsLoadValue) {
m_upsLoadValue = myUpsLoadValue;
if (m_typeOfIcon == generalKI) paintLoad(m_upsLoadValue);
- tqrepaintNow = true;
+ repaintNow = true;
}
// *********BATTERY CHARGE****************
@@ -293,11 +293,11 @@ void KNutDock::tqrepaintDock (const bool always) {
if (myBatteryChargeValue != m_batteryChargeValue) {
m_batteryChargeValue = myBatteryChargeValue;
if (m_typeOfIcon == generalKI)paintCharge(m_batteryChargeValue);
- tqrepaintNow = true;
+ repaintNow = true;
}
// ************* End of values********************
- if (tqrepaintNow || always || (m_dataOk != m_dataOkOld)) {
+ if (repaintNow || always || (m_dataOk != m_dataOkOld)) {
switch (m_typeOfIcon) {
diff --git a/src/knutdock.h b/src/knutdock.h
index aec3612..93b46cf 100755
--- a/src/knutdock.h
+++ b/src/knutdock.h
@@ -147,7 +147,7 @@ class KNutDock : public KSystemTray {
*
* @since 0.4
**/
- void tqrepaintDock ( const bool always = false);
+ void repaintDock ( const bool always = false);
diff --git a/src/knutmainwindow.cpp b/src/knutmainwindow.cpp
index adeab69..0ab214f 100644
--- a/src/knutmainwindow.cpp
+++ b/src/knutmainwindow.cpp
@@ -182,10 +182,10 @@ void KNutMainWindow::setConfig (unsigned int changeSetting) {
//qDebug ("KNutMainWindow::setConfig");
KNutVarData::VarStrucDef analogMemberData;
- bool tqrepaintVoltagePanels = false;
- bool tqrepaintFrequencyPanels = false;
- bool tqrepaintAllPanels = false;
- bool tqrepaintOAPanels = false;
+ bool repaintVoltagePanels = false;
+ bool repaintFrequencyPanels = false;
+ bool repaintAllPanels = false;
+ bool repaintOAPanels = false;
// Main Setting
@@ -236,8 +236,8 @@ void KNutMainWindow::setConfig (unsigned int changeSetting) {
m_analogRecords->setFrequency(50);
}
m_analogRecords->setXfer(m_lowXfer,m_highXfer);
- tqrepaintVoltagePanels = true;
- tqrepaintFrequencyPanels = true;
+ repaintVoltagePanels = true;
+ repaintFrequencyPanels = true;
}
}
else {
@@ -246,12 +246,12 @@ void KNutMainWindow::setConfig (unsigned int changeSetting) {
if ((changeSetting & KNutPrefDlg::ChangeVoltage) || ((changeSetting & KNutPrefDlg::ChangeXFer))) {
// byla aktivovana zmena napeti nebo zmena xfer a zaroven ho ups podporuje
m_analogRecords->setVoltage(m_settingData->inputVoltage);
- tqrepaintVoltagePanels=true;
+ repaintVoltagePanels=true;
}
if ((changeSetting & KNutPrefDlg::ChangeFrequency) || ((changeSetting & KNutPrefDlg::ChangeXFer))) {
// byla aktivovana zmena napeti nebo zmena xfer a zaroven ho ups podporuje
m_analogRecords->setFrequency(m_settingData->inputFrequency);
- tqrepaintFrequencyPanels=true;
+ repaintFrequencyPanels=true;
}
}
}
@@ -267,12 +267,12 @@ void KNutMainWindow::setConfig (unsigned int changeSetting) {
if (m_settingData->customBAnalogColor) {
m_aPanelPalette.setColor(TQPalette::Active,TQColorGroup::Background,m_settingData->aPanelBackgroundColor);
m_aPanelPalette.setColor(TQPalette::Inactive,TQColorGroup::Background,m_settingData->aPanelBackgroundColor);
- tqrepaintAllPanels=true;
+ repaintAllPanels=true;
m_panelMeter->setAnalogBG(m_aPanelPalette);
}
else {
m_aPanelPalette = m_mainPalette;
- tqrepaintAllPanels=true;
+ repaintAllPanels=true;
m_panelMeter->setAnalogBG(m_aPanelPalette);
}
}
@@ -280,17 +280,17 @@ void KNutMainWindow::setConfig (unsigned int changeSetting) {
if ((changeSetting & KNutPrefDlg::ChangeCustomAPanelOColor) || // je provedena zmena barvy panelu
(changeSetting & KNutPrefDlg::ChangeAPOColor)) {
if (m_settingData->customOAnalogColor) {
- tqrepaintAllPanels=true;
- tqrepaintOAPanels=true;
+ repaintAllPanels=true;
+ repaintOAPanels=true;
}
else {
- tqrepaintAllPanels=true;
- tqrepaintOAPanels=true;
+ repaintAllPanels=true;
+ repaintOAPanels=true;
}
}
// regeneration of panel uses for setting Main and setting Analog
// pregenerovani panelu slozi pro setting Main a setting Analog
- m_panelMeter->tqrepaintAnalogPanels (tqrepaintFrequencyPanels, tqrepaintVoltagePanels, tqrepaintAllPanels);
+ m_panelMeter->repaintAnalogPanels (repaintFrequencyPanels, repaintVoltagePanels, repaintAllPanels);
if (m_activeUpsInfo->record.name != "") {
m_panelMeter->setSize();
@@ -451,14 +451,14 @@ void KNutMainWindow::showUpsData (void) {
//qDebug ("KNutMainWindow::showUpsData 1");
m_panelMeter->activateAnalogs(); // makes panel and makes background of panel
- tqrepaintAnalogs(false);
+ repaintAnalogs(false);
//qDebug ("KNutMainWindow::showUpsData 2");
m_panelMeter->setSize(true);
//qDebug ("KNutMainWindow::showUpsData 3");
m_mainSplit->refresh();
- // doesn't tqrepaint analog pointers, because pointers will be tqrepainted twice
+ // doesn't tqrepaint analog pointers, because pointers will be repainted twice
//qDebug ("KNutMainWindow::showUpsData 4");
-// tqrepaintAnalogs(false); // don't make this
+// repaintAnalogs(false); // don't make this
//qDebug ("KNutMainWindow::showUpsData 5");
}
else {
@@ -483,7 +483,7 @@ void KNutMainWindow::setCombo (TQString name) {
if (toolBar(0)->getCombo(1)->currentText() != name) toolBar(0)->getCombo(1)->setCurrentText(name);
}
-void KNutMainWindow::tqrepaintPanel (void) {
+void KNutMainWindow::repaintPanel (void) {
TQString nutStringVar;
if (m_activeUpsInfo->upsNet == 0) return;
@@ -501,8 +501,8 @@ void KNutMainWindow::tqrepaintPanel (void) {
/// je volan vzdy po timeoutu
/// this function is called after timeout always
-void KNutMainWindow::tqrepaintAnalogs ( bool run ) {
-//qDebug ("KNutMainWindow::tqrepaintAnalogs");
+void KNutMainWindow::repaintAnalogs ( bool run ) {
+//qDebug ("KNutMainWindow::repaintAnalogs");
TQString nutStringVar;
@@ -528,7 +528,7 @@ void KNutMainWindow::tqrepaintAnalogs ( bool run ) {
}
}
-//qDebug ("KNutMainWindow::tqrepaintAnalogs 1");
+//qDebug ("KNutMainWindow::repaintAnalogs 1");
for (int i=0; i< knc::NumberOfVars; i++) {
if (m_activeUpsInfo->record.upsVarCode[i] != 0) { // jistota pokud by nam to nekde propadlo
@@ -540,17 +540,17 @@ void KNutMainWindow::tqrepaintAnalogs ( bool run ) {
nutStringVar = m_activeUpsInfo->upsNet->readStringVar ((char *)nameUpsVars2[m_activeUpsInfo->record.upsVarCode[i]]);
break;
}
-//qDebug ("KNutMainWindow::tqrepaintAnalogs 2 ");
+//qDebug ("KNutMainWindow::repaintAnalogs 2 ");
if (nutStringVar.isEmpty()) numVar=0;
else numVar = nutStringVar.toFloat();
- m_panelMeter->tqrepaintScaleAnalogPanel (i, numVar);
- if (newRange) m_panelMeter->tqrepaintAnalogPanels (true, true, false); //freq volt
- m_panelMeter->tqrepaintAnalogPointer(i,numVar,run);
+ m_panelMeter->repaintScaleAnalogPanel (i, numVar);
+ if (newRange) m_panelMeter->repaintAnalogPanels (true, true, false); //freq volt
+ m_panelMeter->repaintAnalogPointer(i,numVar,run);
}
} // end for
-//qDebug ("KNutMainWindow::tqrepaintAnalogs 3 ");
+//qDebug ("KNutMainWindow::repaintAnalogs 3 ");
}
diff --git a/src/knutmainwindow.h b/src/knutmainwindow.h
index 542de06..48ab3a6 100644
--- a/src/knutmainwindow.h
+++ b/src/knutmainwindow.h
@@ -94,7 +94,7 @@ class KNutMainWindow : public KMainWindow {
*
* @since 0.1.2
**/
- void tqrepaintPanel(void);
+ void repaintPanel(void);
/**
@@ -104,7 +104,7 @@ class KNutMainWindow : public KMainWindow {
*
* @since 0.3.1
**/
- void tqrepaintAnalogs ( bool run = true);
+ void repaintAnalogs ( bool run = true);
/**
* Da prikaz k prekresleni analogovych panelu, hlavniho panelu a nastavi jejich hodnoty na
diff --git a/src/knutpanelmeter.cpp b/src/knutpanelmeter.cpp
index ab1b921..1c0acb8 100644
--- a/src/knutpanelmeter.cpp
+++ b/src/knutpanelmeter.cpp
@@ -192,7 +192,7 @@ void KNutPanelMeter::setSize (bool showPanels) {
tqrepaint();
}
-void KNutPanelMeter::tqrepaintScaleAnalogPanel (int panelNumber, float value) {
+void KNutPanelMeter::repaintScaleAnalogPanel (int panelNumber, float value) {
if (m_analogPanels->upsAnalogs[panelNumber] != 0L){
switch (m_activeUpsInfo->record.upsVarCode[panelNumber]) {
@@ -229,7 +229,7 @@ void KNutPanelMeter::tqrepaintScaleAnalogPanel (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]->tqrepaint(); // prekreslime , tqrepaints panel
+ m_analogPanels->upsAnalogs[panelNumber]->tqrepaint(); // prekreslime , repaints panel
m_analogPanels->upsAnalogs[panelNumber]->show(); //zobrazime merak shows analog panel
}
}
@@ -241,7 +241,7 @@ void KNutPanelMeter::tqrepaintScaleAnalogPanel (int panelNumber, float value) {
-void KNutPanelMeter::tqrepaintAnalogPointer (int panelNumber, float value, bool run) {
+void KNutPanelMeter::repaintAnalogPointer (int panelNumber, float value, bool run) {
if (m_analogPanels->upsAnalogs[panelNumber] != 0L)
m_analogPanels->upsAnalogs[panelNumber]->setPointer (value,run); // nastavi hodnotu rucicky
}
@@ -269,7 +269,7 @@ void KNutPanelMeter::changeAnalogPanelsDigProcessing (void) {
}
-void KNutPanelMeter::tqrepaintAnalogPanels (bool tqrepaintFrequencyPanels, bool tqrepaintVoltagePanels, bool tqrepaintAllPanels) {
+void KNutPanelMeter::repaintAnalogPanels (bool repaintFrequencyPanels, bool repaintVoltagePanels, bool repaintAllPanels) {
KNutVarData::VarStrucDef analogMemberData;
@@ -281,10 +281,10 @@ KNutVarData::VarStrucDef analogMemberData;
//if upsAnalogs[x] is set to zero, this upsAnalog is not used
// record.upsVarCode contain list of code of analog meter
// 0 is code for none analog meter, 1 for Input Voltage, 2 for Battery Charge,
- if (((m_activeUpsInfo->record.upsVarCode[i] == knc::VarAcfreq) && (tqrepaintFrequencyPanels)) ||
- ((m_activeUpsInfo->record.upsVarCode[i] == knc::VarOutFreq) && (tqrepaintFrequencyPanels)) ||
+ if (((m_activeUpsInfo->record.upsVarCode[i] == knc::VarAcfreq) && (repaintFrequencyPanels)) ||
+ ((m_activeUpsInfo->record.upsVarCode[i] == knc::VarOutFreq) && (repaintFrequencyPanels)) ||
(((m_activeUpsInfo->record.upsVarCode[i] == knc::VarUtility) ||
- (m_activeUpsInfo->record.upsVarCode[i] == knc::VarOutVolt)) && (tqrepaintVoltagePanels))) {
+ (m_activeUpsInfo->record.upsVarCode[i] == knc::VarOutVolt)) && (repaintVoltagePanels))) {
analogMemberData=m_analogRecords->getData (m_activeUpsInfo->record.upsVarCode[i]); // nacteme data
@@ -297,12 +297,12 @@ KNutVarData::VarStrucDef analogMemberData;
} // end if (!
}// end for (int i=0
- m_analogPanels->upsAnalogs[i]->makeBackground(false); // tqrepaints analog meter
- m_analogPanels->upsAnalogs[i]->tqrepaintPointer(false); // tqrepaints analog meter
- m_analogPanels->upsAnalogs[i]->tqrepaint(); // tqrepaints analog meter
+ m_analogPanels->upsAnalogs[i]->makeBackground(false); // repaints analog meter
+ m_analogPanels->upsAnalogs[i]->repaintPointer(false); // repaints analog meter
+ m_analogPanels->upsAnalogs[i]->tqrepaint(); // repaints analog meter
m_analogPanels->upsAnalogs[i]->show(); // shows analog meter
} // end if (((activeUpsInfo
- if (tqrepaintAllPanels) {
+ if (repaintAllPanels) {
if (m_settingData->customOAnalogColor) {
m_analogPanels->upsAnalogs[i]->setPointerColor(m_settingData->analogFingerColor);
m_analogPanels->upsAnalogs[i]->setArcColor(1,m_settingData->analogOKColor);
@@ -317,7 +317,7 @@ KNutVarData::VarStrucDef analogMemberData;
m_analogPanels->upsAnalogs[i]->setScaleColor (DEFAULT_SCALE_COLOR);
m_analogPanels->upsAnalogs[i]->setFontColor (DEFAULT_FONT_COLOR);
}
- m_analogPanels->upsAnalogs[i]->tqrepaintAll();
+ m_analogPanels->upsAnalogs[i]->repaintAll();
}
}
} // end for
diff --git a/src/knutpanelmeter.h b/src/knutpanelmeter.h
index 3adeae0..8fa668d 100644
--- a/src/knutpanelmeter.h
+++ b/src/knutpanelmeter.h
@@ -90,7 +90,7 @@ public:
*
* @since 0.1
**/
- void tqrepaintScaleAnalogPanel (int panelNumber, float value);
+ void repaintScaleAnalogPanel (int panelNumber, float value);
/**
* Paints pointer for selected analog panel
@@ -105,7 +105,7 @@ public:
*
* @since 0.2
**/
- void tqrepaintAnalogPointer (int panelNumber, float value, bool run = true);
+ void repaintAnalogPointer (int panelNumber, float value, bool run = true);
/**
@@ -114,13 +114,13 @@ public:
* Prekresli a prebarvi analogove panely.
* Prekresuje rozsah panelu pro frekvenci a nepeti na zaklade soucasneho nastaveni.
*
- * @param tqrepaintFrequencyPanels urcuje ze ma prekreslit panely ktere zobrazuji vstupni frequency.
- * @param tqrepaintVoltagePanels urcuje ze ma prekreslit panely ktere zobrazuji vstupni a vystupni napeti.
- * @param tqrepaintAllPanels urcuje ze ma prebarvit vsechny prvky panelu.
+ * @param repaintFrequencyPanels urcuje ze ma prekreslit panely ktere zobrazuji vstupni frequency.
+ * @param repaintVoltagePanels urcuje ze ma prekreslit panely ktere zobrazuji vstupni a vystupni napeti.
+ * @param repaintAllPanels urcuje ze ma prebarvit vsechny prvky panelu.
*
* @since 0.1
**/
- void tqrepaintAnalogPanels (bool tqrepaintFrequencyPanels, bool tqrepaintVoltagePanels, bool tqrepaintAllPanels);
+ void repaintAnalogPanels (bool repaintFrequencyPanels, bool repaintVoltagePanels, bool repaintAllPanels);
@@ -128,7 +128,7 @@ public:
/**
- * Changes type of digital processing of pointer and tqrepaints it.
+ * Changes type of digital processing of pointer and repaints it.
* Zmeni zpusob digitalniho zpracovani rucucky a prekresli ji
*
* @since 0.1