From 070158cb33f445939454a8bcb61ba06e0739f845 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Wed, 22 Feb 2006 17:48:25 +0000 Subject: [PATCH] fix for Windows, code style --- src/llconserverdlg.cpp | 17 ++++++++++++----- src/multicolorled.h | 37 ++++++++++++++++++++++++------------- 2 files changed, 36 insertions(+), 18 deletions(-) diff --git a/src/llconserverdlg.cpp b/src/llconserverdlg.cpp index 6312bb1d..a9e549a7 100755 --- a/src/llconserverdlg.cpp +++ b/src/llconserverdlg.cpp @@ -136,13 +136,20 @@ void CLlconServerDlg::OnTimer() // QString().sprintf("%5.2f", vecdSamOffs[i])); #ifndef _WIN32 - vecpListViewItems[i]->setVisible(true); + vecpListViewItems[i]->setVisible ( true ); #endif } -#ifndef _WIN32 - else - vecpListViewItems[i]->setVisible(false); -#endif + else + { +#ifdef _WIN32 + /* remove text for Windows version */ + vecpListViewItems[i]->setText(0,""); + vecpListViewItems[i]->setText(3,""); + vecpListViewItems[i]->setText(4,""); +#else + vecpListViewItems[i]->setVisible ( false ); +#endif + } } ListViewMutex.unlock(); diff --git a/src/multicolorled.h b/src/multicolorled.h index d03b70d0..6d6ec74b 100755 --- a/src/multicolorled.h +++ b/src/multicolorled.h @@ -101,15 +101,22 @@ protected: class CMultColLEDListViewItem : public CMultiColorLEDbase { public: - CMultColLEDListViewItem(const int iNewCol) : iColumn(iNewCol), - pListViewItem(NULL) {} + CMultColLEDListViewItem ( const int iNewCol ) : iColumn ( iNewCol ), + pListViewItem ( NULL ) {} - void SetListViewItemPointer(QListViewItem* pNewListViewItem) - {pListViewItem = pNewListViewItem;} + void SetListViewItemPointer ( QListViewItem* pNewListViewItem ) + { + pListViewItem = pNewListViewItem; + } protected: - virtual void SetPixmap(QPixmap& NewBitmap) - {if (pListViewItem != NULL) pListViewItem->setPixmap(iColumn, NewBitmap);} + virtual void SetPixmap ( QPixmap& NewBitmap ) + { + if ( pListViewItem != NULL ) + { + pListViewItem->setPixmap ( iColumn, NewBitmap ); + } + } QListViewItem* pListViewItem; int iColumn; @@ -119,15 +126,19 @@ protected: class CServerListViewItem : public QListViewItem { public: - CServerListViewItem(QListView* parent) : LED0(1), LED1(2), - QListViewItem(parent) {LED0.SetListViewItemPointer(this); - LED1.SetListViewItemPointer(this);} + CServerListViewItem ( QListView* parent ) : LED0 ( 1 ), LED1 ( 2 ), + QListViewItem ( parent ) + { + LED0.SetListViewItemPointer ( this ); + LED1.SetListViewItemPointer ( this ); + } - void SetLight(int iWhichLED, int iNewStatus) + void SetLight ( int iWhichLED, int iNewStatus ) { - switch (iWhichLED) { - case 0: LED0.SetLight(iNewStatus); break; - case 1: LED1.SetLight(iNewStatus); break; + switch ( iWhichLED ) + { + case 0: LED0.SetLight ( iNewStatus ); break; + case 1: LED1.SetLight ( iNewStatus ); break; } }