diff --git a/src/apps/cortex/DormantNodeView/DormantNodeListItem.cpp b/src/apps/cortex/DormantNodeView/DormantNodeListItem.cpp index dd35f1cb65..7f9093beb4 100644 --- a/src/apps/cortex/DormantNodeView/DormantNodeListItem.cpp +++ b/src/apps/cortex/DormantNodeView/DormantNodeListItem.cpp @@ -69,12 +69,12 @@ void DormantNodeListItem::DrawItem( r.right = r.left + B_MINI_ICON - 1.0; r.bottom = r.top + B_MINI_ICON - 1.0; if (IsSelected()) { - owner->SetHighColor(255.0, 255.0, 255.0, 255.0); + owner->SetHighColor(255, 255, 255, 255); owner->FillRect(r); owner->SetDrawingMode(B_OP_INVERT); owner->DrawBitmap(m_icon, r.LeftTop()); owner->SetDrawingMode(B_OP_ALPHA); - owner->SetHighColor(0.0, 0.0, 0.0, 180.0); + owner->SetHighColor(0, 0, 0, 180); owner->SetBlendingMode(B_CONSTANT_ALPHA, B_ALPHA_COMPOSITE); owner->DrawBitmap(m_icon, r.LeftTop()); owner->SetDrawingMode(B_OP_OVER); @@ -93,7 +93,7 @@ void DormantNodeListItem::DrawItem( r.bottom = r.top + m_fontHeight.ascent + m_fontHeight.descent; if (IsSelected() || drawEverything) { if (IsSelected()) { - owner->SetHighColor(16.0, 64.0, 96.0, 255.0); + owner->SetHighColor(16, 64, 96, 255); } else { owner->SetHighColor(owner->ViewColor()); @@ -101,10 +101,10 @@ void DormantNodeListItem::DrawItem( owner->FillRect(r); } if (IsSelected()) { - owner->SetHighColor(255.0, 255.0, 255.0, 255.0); + owner->SetHighColor(255, 255, 255, 255); } else { - owner->SetHighColor(0.0, 0.0, 0.0, 0.0); + owner->SetHighColor(0, 0, 0, 0); } BPoint labelOffset(r.left + 1.0, r.bottom - m_fontHeight.descent); owner->DrawString(m_info.name, labelOffset); @@ -199,10 +199,10 @@ BBitmap *DormantNodeListItem::getDragBitmap() { BView *dragView = new BView(dragBitmap->Bounds(), "", B_FOLLOW_NONE, 0); dragBitmap->AddChild(dragView); dragView->SetOrigin(0.0, 0.0); - dragView->SetHighColor(0.0, 0.0, 0.0, 0.0); + dragView->SetHighColor(0, 0, 0, 0); dragView->FillRect(dragView->Bounds()); dragView->SetDrawingMode(B_OP_ALPHA); - dragView->SetHighColor(0.0, 0.0, 0.0, 128.0); + dragView->SetHighColor(0, 0, 0, 128); dragView->SetBlendingMode(B_CONSTANT_ALPHA, B_ALPHA_COMPOSITE); // Drawing code back again if (m_icon) { diff --git a/src/apps/cortex/RouteApp/StatusView.cpp b/src/apps/cortex/RouteApp/StatusView.cpp index 7a32945262..2990064c04 100644 --- a/src/apps/cortex/RouteApp/StatusView.cpp +++ b/src/apps/cortex/RouteApp/StatusView.cpp @@ -288,7 +288,7 @@ StatusView::drawInto(BView *v, BRect updateRect) r.InsetBy(2.0, 0.0); v->SetDrawingMode(B_OP_ALPHA); - v->SetHighColor(0, 0, 0, 255 * m_opacity); + v->SetHighColor(0, 0, 0, uchar(255 * m_opacity)); // draw icon if (m_icon) { diff --git a/src/apps/cortex/ValControl/ValControlDigitSegment.cpp b/src/apps/cortex/ValControl/ValControlDigitSegment.cpp index 38243b94fe..8373f8f20d 100644 --- a/src/apps/cortex/ValControl/ValControlDigitSegment.cpp +++ b/src/apps/cortex/ValControl/ValControlDigitSegment.cpp @@ -316,7 +316,7 @@ void ValControlDigitSegment::MessageReceived(BMessage* pMsg) { case ValControl::M_SET_VALUE: err = pMsg->FindDouble("value", &fVal); ASSERT(err == B_OK); - setValue(fVal, fVal < 0); + setValue((int64)fVal, fVal < 0); break; case ValControl::M_GET_VALUE: { diff --git a/src/apps/cortex/support/ILockable.h b/src/apps/cortex/support/ILockable.h index 48845a8adb..4a91c7a312 100644 --- a/src/apps/cortex/support/ILockable.h +++ b/src/apps/cortex/support/ILockable.h @@ -32,6 +32,9 @@ __BEGIN_CORTEX_NAMESPACE // the locking interface class ILockable { +public: + ILockable() { } + virtual ~ILockable() { } public: // constants enum lock_t { WRITE, diff --git a/src/apps/cortex/support/IObservable.h b/src/apps/cortex/support/IObservable.h index d48920e6c3..f8e858baf5 100644 --- a/src/apps/cortex/support/IObservable.h +++ b/src/apps/cortex/support/IObservable.h @@ -14,6 +14,9 @@ __BEGIN_CORTEX_NAMESPACE class IObservable { +public: + IObservable() { } + virtual ~IObservable() { } public: // *** deletion // clients must call release() rather than deleting, // to ensure that all observers are notified of the diff --git a/src/apps/cortex/support/MouseTrackingHelpers.h b/src/apps/cortex/support/MouseTrackingHelpers.h index 70fe9a9c0a..423d9826be 100644 --- a/src/apps/cortex/support/MouseTrackingHelpers.h +++ b/src/apps/cortex/support/MouseTrackingHelpers.h @@ -25,6 +25,8 @@ class MouseTrackingSourceView; // interface for a mouse-tracking destination class IMouseTrackingDestination { public: // operations + IMouseTrackingDestination() { } + virtual ~IMouseTrackingDestination() { } // a MouseTrackingSourceView has started tracking the mouse // (point is in pSource view coordinates) virtual void mouseTrackingBegin( diff --git a/src/apps/cortex/support/ObservableHandler.cpp b/src/apps/cortex/support/ObservableHandler.cpp index a10ee01ac9..507664eb23 100644 --- a/src/apps/cortex/support/ObservableHandler.cpp +++ b/src/apps/cortex/support/ObservableHandler.cpp @@ -267,4 +267,4 @@ void ObservableHandler::_handleRemoveObserver( } -// END -- ObservableHandler.cpp -- \ No newline at end of file +// END -- ObservableHandler.cpp -- diff --git a/src/apps/cortex/support/TextControlFloater.cpp b/src/apps/cortex/support/TextControlFloater.cpp index 1778e35418..7b62cb049c 100644 --- a/src/apps/cortex/support/TextControlFloater.cpp +++ b/src/apps/cortex/support/TextControlFloater.cpp @@ -156,4 +156,4 @@ bool TextControlFloater::QuitRequested() { return true; } -// END -- TextControlFloater.cpp -- \ No newline at end of file +// END -- TextControlFloater.cpp --