diff --git a/src/apps/debuganalyzer/util/Variant.h b/headers/private/shared/Variant.h similarity index 62% rename from src/apps/debuganalyzer/util/Variant.h rename to headers/private/shared/Variant.h index ff743f53ad..4da5eb5b46 100644 --- a/src/apps/debuganalyzer/util/Variant.h +++ b/headers/private/shared/Variant.h @@ -2,8 +2,8 @@ * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de. * Distributed under the terms of the MIT License. */ -#ifndef VARIANT_H -#define VARIANT_H +#ifndef _VARIANT_H +#define _VARIANT_H #include @@ -11,31 +11,31 @@ enum { - VARIANT_DONT_COPY_DATA = 0x01, - VARIANT_OWNS_DATA = 0x02 + B_VARIANT_DONT_COPY_DATA = 0x01, + B_VARIANT_OWNS_DATA = 0x02 }; -class Variant { +class BVariant { public: - inline Variant(); - inline Variant(int8 value); - inline Variant(uint8 value); - inline Variant(int16 value); - inline Variant(uint16 value); - inline Variant(int32 value); - inline Variant(uint32 value); - inline Variant(int64 value); - inline Variant(uint64 value); - inline Variant(float value); - inline Variant(double value); - inline Variant(const void* value); - inline Variant(const char* value, + inline BVariant(); + inline BVariant(int8 value); + inline BVariant(uint8 value); + inline BVariant(int16 value); + inline BVariant(uint16 value); + inline BVariant(int32 value); + inline BVariant(uint32 value); + inline BVariant(int64 value); + inline BVariant(uint64 value); + inline BVariant(float value); + inline BVariant(double value); + inline BVariant(const void* value); + inline BVariant(const char* value, uint32 flags = 0); - inline Variant(const Variant& other); - ~Variant(); + inline BVariant(const BVariant& other); + ~BVariant(); - inline void SetTo(const Variant& other); + inline void SetTo(const BVariant& other); inline void SetTo(int8 value); inline void SetTo(uint8 value); inline void SetTo(int16 value); @@ -51,7 +51,7 @@ public: uint32 flags = 0); void Unset(); - inline Variant& operator=(const Variant& other); + inline BVariant& operator=(const BVariant& other); type_code Type() const { return fType; } @@ -74,7 +74,7 @@ public: const char* ToString() const; private: - void _SetTo(const Variant& other); + void _SetTo(const BVariant& other); void _SetTo(int8 value); void _SetTo(uint8 value); void _SetTo(int16 value); @@ -112,7 +112,7 @@ private: }; -Variant::Variant() +BVariant::BVariant() : fType(0), fFlags(0) @@ -120,86 +120,86 @@ Variant::Variant() } -Variant::Variant(int8 value) +BVariant::BVariant(int8 value) { _SetTo(value); } -Variant::Variant(uint8 value) +BVariant::BVariant(uint8 value) { _SetTo(value); } -Variant::Variant(int16 value) +BVariant::BVariant(int16 value) { _SetTo(value); } -Variant::Variant(uint16 value) +BVariant::BVariant(uint16 value) { _SetTo(value); } -Variant::Variant(int32 value) +BVariant::BVariant(int32 value) { _SetTo(value); } -Variant::Variant(uint32 value) +BVariant::BVariant(uint32 value) { _SetTo(value); } -Variant::Variant(int64 value) +BVariant::BVariant(int64 value) { _SetTo(value); } -Variant::Variant(uint64 value) +BVariant::BVariant(uint64 value) { _SetTo(value); } -Variant::Variant(float value) +BVariant::BVariant(float value) { _SetTo(value); } -Variant::Variant(double value) +BVariant::BVariant(double value) { _SetTo(value); } -Variant::Variant(const void* value) +BVariant::BVariant(const void* value) { _SetTo(value); } -Variant::Variant(const char* value, uint32 flags) +BVariant::BVariant(const char* value, uint32 flags) { _SetTo(value, flags); } -Variant::Variant(const Variant& other) +BVariant::BVariant(const BVariant& other) { _SetTo(other); } -Variant& -Variant::operator=(const Variant& other) +BVariant& +BVariant::operator=(const BVariant& other) { Unset(); _SetTo(other); @@ -208,7 +208,7 @@ Variant::operator=(const Variant& other) void -Variant::SetTo(const Variant& other) +BVariant::SetTo(const BVariant& other) { Unset(); _SetTo(other); @@ -216,7 +216,7 @@ Variant::SetTo(const Variant& other) void -Variant::SetTo(int8 value) +BVariant::SetTo(int8 value) { Unset(); _SetTo(value); @@ -224,7 +224,7 @@ Variant::SetTo(int8 value) void -Variant::SetTo(uint8 value) +BVariant::SetTo(uint8 value) { Unset(); _SetTo(value); @@ -232,7 +232,7 @@ Variant::SetTo(uint8 value) void -Variant::SetTo(int16 value) +BVariant::SetTo(int16 value) { Unset(); _SetTo(value); @@ -240,7 +240,7 @@ Variant::SetTo(int16 value) void -Variant::SetTo(uint16 value) +BVariant::SetTo(uint16 value) { Unset(); _SetTo(value); @@ -248,7 +248,7 @@ Variant::SetTo(uint16 value) void -Variant::SetTo(int32 value) +BVariant::SetTo(int32 value) { Unset(); _SetTo(value); @@ -256,7 +256,7 @@ Variant::SetTo(int32 value) void -Variant::SetTo(uint32 value) +BVariant::SetTo(uint32 value) { Unset(); _SetTo(value); @@ -264,7 +264,7 @@ Variant::SetTo(uint32 value) void -Variant::SetTo(int64 value) +BVariant::SetTo(int64 value) { Unset(); _SetTo(value); @@ -272,7 +272,7 @@ Variant::SetTo(int64 value) void -Variant::SetTo(uint64 value) +BVariant::SetTo(uint64 value) { Unset(); _SetTo(value); @@ -280,7 +280,7 @@ Variant::SetTo(uint64 value) void -Variant::SetTo(float value) +BVariant::SetTo(float value) { Unset(); _SetTo(value); @@ -288,7 +288,7 @@ Variant::SetTo(float value) void -Variant::SetTo(double value) +BVariant::SetTo(double value) { Unset(); _SetTo(value); @@ -296,7 +296,7 @@ Variant::SetTo(double value) void -Variant::SetTo(const void* value) +BVariant::SetTo(const void* value) { Unset(); _SetTo(value); @@ -304,11 +304,11 @@ Variant::SetTo(const void* value) void -Variant::SetTo(const char* value, uint32 flags) +BVariant::SetTo(const char* value, uint32 flags) { Unset(); _SetTo(value, flags); } -#endif // VARIANT_H +#endif // _VARIANT_H diff --git a/src/apps/debuganalyzer/Jamfile b/src/apps/debuganalyzer/Jamfile index fa3e4c8770..814cfdd146 100644 --- a/src/apps/debuganalyzer/Jamfile +++ b/src/apps/debuganalyzer/Jamfile @@ -3,7 +3,7 @@ SubDir HAIKU_TOP src apps debuganalyzer ; UsePrivateHeaders debug interface kernel shared ; UsePrivateSystemHeaders ; -HAIKU_DEBUG_ANALYZER_HEADERS = +HAIKU_DEBUG_ANALYZER_HEADERS = $(SUBDIR) [ FDirName $(SUBDIR) gui ] [ FDirName $(SUBDIR) model ] @@ -24,7 +24,7 @@ Application DebugAnalyzer DebugAnalyzer_model_loader.o DebugAnalyzer_util.o - libcolumnlistview.a libdebug.so be + libcolumnlistview.a libshared.a libdebug.so be : DebugAnalyzer.rdef ; diff --git a/src/apps/debuganalyzer/gui/main_window/TeamsPage.cpp b/src/apps/debuganalyzer/gui/main_window/TeamsPage.cpp index b19bbccdc1..9a37ba245a 100644 --- a/src/apps/debuganalyzer/gui/main_window/TeamsPage.cpp +++ b/src/apps/debuganalyzer/gui/main_window/TeamsPage.cpp @@ -33,7 +33,7 @@ public: return fModel->CountTeams(); } - virtual bool GetValueAt(int32 rowIndex, int32 columnIndex, Variant& value) + virtual bool GetValueAt(int32 rowIndex, int32 columnIndex, BVariant& value) { Model::Team* team = fModel->TeamAt(rowIndex); if (team == NULL) @@ -44,7 +44,7 @@ public: value.SetTo(team->ID()); return true; case 1: - value.SetTo(team->Name(), VARIANT_DONT_COPY_DATA); + value.SetTo(team->Name(), B_VARIANT_DONT_COPY_DATA); return true; case 2: value.SetTo(team->CreationTime()); diff --git a/src/apps/debuganalyzer/gui/main_window/ThreadsPage.cpp b/src/apps/debuganalyzer/gui/main_window/ThreadsPage.cpp index 15b799031c..6ce4ef66e0 100644 --- a/src/apps/debuganalyzer/gui/main_window/ThreadsPage.cpp +++ b/src/apps/debuganalyzer/gui/main_window/ThreadsPage.cpp @@ -33,7 +33,7 @@ public: return fModel->CountThreads(); } - virtual bool GetValueAt(int32 rowIndex, int32 columnIndex, Variant& value) + virtual bool GetValueAt(int32 rowIndex, int32 columnIndex, BVariant& value) { Model::Thread* thread = fModel->ThreadAt(rowIndex); if (thread == NULL) @@ -44,7 +44,7 @@ public: value.SetTo(thread->ID()); return true; case 1: - value.SetTo(thread->Name(), VARIANT_DONT_COPY_DATA); + value.SetTo(thread->Name(), B_VARIANT_DONT_COPY_DATA); return true; case 2: { diff --git a/src/apps/debuganalyzer/gui/table/Table.cpp b/src/apps/debuganalyzer/gui/table/Table.cpp index 7f277b2fd1..1e8851a1a3 100644 --- a/src/apps/debuganalyzer/gui/table/Table.cpp +++ b/src/apps/debuganalyzer/gui/table/Table.cpp @@ -271,7 +271,7 @@ Table::Column::DrawField(BField* _field, BRect rect, BView* targetView) return; int32 modelIndex = fTableColumn->ModelIndex(); - Variant value; + BVariant value; if (!fModel->GetValueAt(field->RowIndex(), modelIndex, value)) return; fTableColumn->DrawValue(value, rect, targetView); @@ -293,9 +293,9 @@ Table::Column::CompareFields(BField* _field1, BField* _field2) return 1; int32 modelIndex = fTableColumn->ModelIndex(); - Variant value1; + BVariant value1; bool valid1 = fModel->GetValueAt(field1->RowIndex(), modelIndex, value1); - Variant value2; + BVariant value2; bool valid2 = fModel->GetValueAt(field2->RowIndex(), modelIndex, value2); if (!valid1) @@ -322,7 +322,7 @@ Table::Column::GetPreferredWidth(BField* _field, BView* parent) const return Width(); int32 modelIndex = fTableColumn->ModelIndex(); - Variant value; + BVariant value; if (!fModel->GetValueAt(field->RowIndex(), modelIndex, value)) return Width(); return fTableColumn->GetPreferredWidth(value, parent); diff --git a/src/apps/debuganalyzer/gui/table/Table.h b/src/apps/debuganalyzer/gui/table/Table.h index 02c29f59c0..0b3d009d3d 100644 --- a/src/apps/debuganalyzer/gui/table/Table.h +++ b/src/apps/debuganalyzer/gui/table/Table.h @@ -9,12 +9,11 @@ #include #include +#include #include "table/AbstractTable.h" #include "table/TableColumn.h" -#include "Variant.h" - class Table; class TableModel; @@ -40,7 +39,7 @@ public: virtual int32 CountRows() const = 0; virtual bool GetValueAt(int32 rowIndex, int32 columnIndex, - Variant& value) = 0; + BVariant& value) = 0; virtual bool AddListener(TableModelListener* listener); virtual void RemoveListener(TableModelListener* listener); diff --git a/src/apps/debuganalyzer/gui/table/TableColumn.cpp b/src/apps/debuganalyzer/gui/table/TableColumn.cpp index 5b833199c1..50dd35e148 100644 --- a/src/apps/debuganalyzer/gui/table/TableColumn.cpp +++ b/src/apps/debuganalyzer/gui/table/TableColumn.cpp @@ -39,20 +39,20 @@ TableColumn::DrawTitle(BRect rect, BView* targetView) void -TableColumn::DrawValue(const Variant& value, BRect rect, BView* targetView) +TableColumn::DrawValue(const BVariant& value, BRect rect, BView* targetView) { } int -TableColumn::CompareValues(const Variant& a, const Variant& b) +TableColumn::CompareValues(const BVariant& a, const BVariant& b) { return 0; } float -TableColumn::GetPreferredWidth(const Variant& value, BView* parent) const +TableColumn::GetPreferredWidth(const BVariant& value, BView* parent) const { return Width(); } diff --git a/src/apps/debuganalyzer/gui/table/TableColumn.h b/src/apps/debuganalyzer/gui/table/TableColumn.h index 39b71aa82e..50bce9e3da 100644 --- a/src/apps/debuganalyzer/gui/table/TableColumn.h +++ b/src/apps/debuganalyzer/gui/table/TableColumn.h @@ -8,7 +8,7 @@ #include #include -#include "Variant.h" +#include class BString; @@ -33,13 +33,13 @@ public: virtual void GetColumnName(BString* into) const; virtual void DrawTitle(BRect rect, BView* targetView); - virtual void DrawValue(const Variant& value, BRect rect, + virtual void DrawValue(const BVariant& value, BRect rect, BView* targetView); - virtual int CompareValues(const Variant& a, - const Variant& b); - virtual float GetPreferredWidth(const Variant& value, + virtual int CompareValues(const BVariant& a, + const BVariant& b); + virtual float GetPreferredWidth(const BVariant& value, BView* parent) const; - + private: int32 fModelIndex; float fWidth; diff --git a/src/apps/debuganalyzer/gui/table/TableColumns.cpp b/src/apps/debuganalyzer/gui/table/TableColumns.cpp index 27e0a8cb32..e13b57307a 100644 --- a/src/apps/debuganalyzer/gui/table/TableColumns.cpp +++ b/src/apps/debuganalyzer/gui/table/TableColumns.cpp @@ -41,7 +41,7 @@ DelagateBasedTableColumn::GetColumnName(BString* into) const void -DelagateBasedTableColumn::DrawValue(const Variant& value, BRect rect, +DelagateBasedTableColumn::DrawValue(const BVariant& value, BRect rect, BView* targetView) { fColumnDelegate->DrawField(PrepareField(value), rect, targetView); @@ -49,7 +49,7 @@ DelagateBasedTableColumn::DrawValue(const Variant& value, BRect rect, float -DelagateBasedTableColumn::GetPreferredWidth(const Variant& value, +DelagateBasedTableColumn::GetPreferredWidth(const BVariant& value, BView* parent) const { return fColumnDelegate->GetPreferredWidth(PrepareField(value), parent); @@ -77,7 +77,7 @@ StringTableColumn::~StringTableColumn() BField* -StringTableColumn::PrepareField(const Variant& value) const +StringTableColumn::PrepareField(const BVariant& value) const { fField.SetString(value.ToString()); fField.SetWidth(Width()); @@ -86,7 +86,7 @@ StringTableColumn::PrepareField(const Variant& value) const int -StringTableColumn::CompareValues(const Variant& a, const Variant& b) +StringTableColumn::CompareValues(const BVariant& a, const BVariant& b) { return strcasecmp(a.ToString(), b.ToString()); } @@ -106,17 +106,17 @@ Int32TableColumn::Int32TableColumn(int32 modelIndex, const char* title, BField* -Int32TableColumn::PrepareField(const Variant& value) const +Int32TableColumn::PrepareField(const BVariant& value) const { char buffer[16]; snprintf(buffer, sizeof(buffer), "%ld", value.ToInt32()); return StringTableColumn::PrepareField( - Variant(buffer, VARIANT_DONT_COPY_DATA)); + BVariant(buffer, B_VARIANT_DONT_COPY_DATA)); } int -Int32TableColumn::CompareValues(const Variant& a, const Variant& b) +Int32TableColumn::CompareValues(const BVariant& a, const BVariant& b) { return a.ToInt32() - b.ToInt32(); } @@ -136,17 +136,17 @@ Int64TableColumn::Int64TableColumn(int32 modelIndex, const char* title, BField* -Int64TableColumn::PrepareField(const Variant& value) const +Int64TableColumn::PrepareField(const BVariant& value) const { char buffer[32]; snprintf(buffer, sizeof(buffer), "%lld", value.ToInt64()); return StringTableColumn::PrepareField( - Variant(buffer, VARIANT_DONT_COPY_DATA)); + BVariant(buffer, B_VARIANT_DONT_COPY_DATA)); } int -Int64TableColumn::CompareValues(const Variant& a, const Variant& b) +Int64TableColumn::CompareValues(const BVariant& a, const BVariant& b) { int64 diff = a.ToInt64() - b.ToInt64(); if (diff == 0) @@ -170,12 +170,12 @@ BigtimeTableColumn::BigtimeTableColumn(int32 modelIndex, const char* title, BField* -BigtimeTableColumn::PrepareField(const Variant& value) const +BigtimeTableColumn::PrepareField(const BVariant& value) const { bigtime_t time = value.ToInt64(); if (time < 0) { return StringTableColumn::PrepareField( - Variant("-", VARIANT_DONT_COPY_DATA)); + BVariant("-", B_VARIANT_DONT_COPY_DATA)); } int micros = int(time % 1000000); @@ -189,19 +189,19 @@ BigtimeTableColumn::PrepareField(const Variant& value) const snprintf(buffer, sizeof(buffer), "%02lld:%02d:%02d:%06d", time, minutes, seconds, micros); return StringTableColumn::PrepareField( - Variant(buffer, VARIANT_DONT_COPY_DATA)); + BVariant(buffer, B_VARIANT_DONT_COPY_DATA)); } int -BigtimeTableColumn::CompareValues(const Variant& _a, const Variant& _b) +BigtimeTableColumn::CompareValues(const BVariant& _a, const BVariant& _b) { bigtime_t a = _a.ToInt64(); bigtime_t b = _b.ToInt64(); if (a == b) return 0; - + if (a < 0) return fInvalidFirst ? -1 : 1; if (b < 0) diff --git a/src/apps/debuganalyzer/gui/table/TableColumns.h b/src/apps/debuganalyzer/gui/table/TableColumns.h index 10dfc4da5a..1ef12e7397 100644 --- a/src/apps/debuganalyzer/gui/table/TableColumns.h +++ b/src/apps/debuganalyzer/gui/table/TableColumns.h @@ -23,12 +23,12 @@ protected: virtual void DrawTitle(BRect rect, BView* targetView); virtual void GetColumnName(BString* into) const; - virtual void DrawValue(const Variant& value, BRect rect, + virtual void DrawValue(const BVariant& value, BRect rect, BView* targetView); - virtual float GetPreferredWidth(const Variant& value, + virtual float GetPreferredWidth(const BVariant& value, BView* parent) const; - virtual BField* PrepareField(const Variant& value) const = 0; + virtual BField* PrepareField(const BVariant& value) const = 0; protected: BColumn* fColumnDelegate; @@ -45,10 +45,10 @@ public: virtual ~StringTableColumn(); protected: - virtual BField* PrepareField(const Variant& value) const; + virtual BField* PrepareField(const BVariant& value) const; - virtual int CompareValues(const Variant& a, - const Variant& b); + virtual int CompareValues(const BVariant& a, + const BVariant& b); private: BStringColumn fColumn; @@ -65,10 +65,10 @@ public: alignment align = B_ALIGN_RIGHT); protected: - virtual BField* PrepareField(const Variant& value) const; + virtual BField* PrepareField(const BVariant& value) const; - virtual int CompareValues(const Variant& a, - const Variant& b); + virtual int CompareValues(const BVariant& a, + const BVariant& b); }; @@ -81,10 +81,10 @@ public: alignment align = B_ALIGN_RIGHT); protected: - virtual BField* PrepareField(const Variant& value) const; + virtual BField* PrepareField(const BVariant& value) const; - virtual int CompareValues(const Variant& a, - const Variant& b); + virtual int CompareValues(const BVariant& a, + const BVariant& b); }; @@ -98,10 +98,10 @@ public: alignment align = B_ALIGN_RIGHT); protected: - virtual BField* PrepareField(const Variant& value) const; + virtual BField* PrepareField(const BVariant& value) const; - virtual int CompareValues(const Variant& a, - const Variant& b); + virtual int CompareValues(const BVariant& a, + const BVariant& b); private: bool fInvalidFirst; diff --git a/src/apps/debuganalyzer/gui/table/TreeTable.cpp b/src/apps/debuganalyzer/gui/table/TreeTable.cpp index 6e9cde0a2c..82716af7d8 100644 --- a/src/apps/debuganalyzer/gui/table/TreeTable.cpp +++ b/src/apps/debuganalyzer/gui/table/TreeTable.cpp @@ -112,7 +112,7 @@ TreeTable::Column::DrawField(BField* _field, BRect rect, BView* targetView) return; int32 modelIndex = fTableColumn->ModelIndex(); - Variant value; + BVariant value; if (!fModel->GetValueAt(field->Object(), modelIndex, value)) return; fTableColumn->DrawValue(value, rect, targetView); @@ -134,9 +134,9 @@ TreeTable::Column::CompareFields(BField* _field1, BField* _field2) return 1; int32 modelIndex = fTableColumn->ModelIndex(); - Variant value1; + BVariant value1; bool valid1 = fModel->GetValueAt(field1->Object(), modelIndex, value1); - Variant value2; + BVariant value2; bool valid2 = fModel->GetValueAt(field2->Object(), modelIndex, value2); if (!valid1) @@ -163,7 +163,7 @@ TreeTable::Column::GetPreferredWidth(BField* _field, BView* parent) const return Width(); int32 modelIndex = fTableColumn->ModelIndex(); - Variant value; + BVariant value; if (!fModel->GetValueAt(field->Object(), modelIndex, value)) return Width(); return fTableColumn->GetPreferredWidth(value, parent); diff --git a/src/apps/debuganalyzer/gui/table/TreeTable.h b/src/apps/debuganalyzer/gui/table/TreeTable.h index 4542a94427..72c650da04 100644 --- a/src/apps/debuganalyzer/gui/table/TreeTable.h +++ b/src/apps/debuganalyzer/gui/table/TreeTable.h @@ -6,12 +6,11 @@ #define TREE_TABLE_H #include +#include #include "table/AbstractTable.h" #include "table/TableColumn.h" -#include "Variant.h" - class TreeTable; @@ -27,7 +26,7 @@ public: virtual void* ChildAt(void* parent, int32 index) const = 0; virtual bool GetValueAt(void* object, int32 columnIndex, - Variant& value) = 0; + BVariant& value) = 0; }; diff --git a/src/apps/debuganalyzer/gui/thread_window/WaitObjectsPage.cpp b/src/apps/debuganalyzer/gui/thread_window/WaitObjectsPage.cpp index 77ab532d0b..0b751b96c4 100644 --- a/src/apps/debuganalyzer/gui/thread_window/WaitObjectsPage.cpp +++ b/src/apps/debuganalyzer/gui/thread_window/WaitObjectsPage.cpp @@ -55,7 +55,7 @@ public: return 6; } - virtual bool GetValueAt(void* object, int32 columnIndex, Variant& value) + virtual bool GetValueAt(void* object, int32 columnIndex, BVariant& value) { return ((Node*)object)->GetValueAt(columnIndex, value); } @@ -66,7 +66,7 @@ private: virtual int32 CountChildren() const = 0; virtual void* ChildAt(int32 index) const = 0; - virtual bool GetValueAt(int32 columnIndex, Variant& value) = 0; + virtual bool GetValueAt(int32 columnIndex, BVariant& value) = 0; }; struct ObjectNode : Node { @@ -88,7 +88,7 @@ private: return NULL; } - virtual bool GetValueAt(int32 columnIndex, Variant& value) + virtual bool GetValueAt(int32 columnIndex, BVariant& value) { return _GetWaitObjectValueAt(object, columnIndex, value); } @@ -123,7 +123,7 @@ private: return objectNodes.ItemAt(index); } - virtual bool GetValueAt(int32 columnIndex, Variant& value) + virtual bool GetValueAt(int32 columnIndex, BVariant& value) { if (columnIndex <= 2) { return _GetWaitObjectValueAt(group->WaitObjectAt(0), @@ -174,7 +174,7 @@ private: return groupNodes.ItemAt(index); } - virtual bool GetValueAt(int32 columnIndex, Variant& value) + virtual bool GetValueAt(int32 columnIndex, BVariant& value) { return false; } @@ -215,15 +215,15 @@ private: } static bool _GetWaitObjectValueAt(Model::ThreadWaitObject* waitObject, - int32 columnIndex, Variant& value) + int32 columnIndex, BVariant& value) { switch (columnIndex) { case 0: value.SetTo(_TypeToString(waitObject->Type()), - VARIANT_DONT_COPY_DATA); + B_VARIANT_DONT_COPY_DATA); return true; case 1: - value.SetTo(waitObject->Name(), VARIANT_DONT_COPY_DATA); + value.SetTo(waitObject->Name(), B_VARIANT_DONT_COPY_DATA); return true; case 2: { diff --git a/src/apps/debuganalyzer/util/Jamfile b/src/apps/debuganalyzer/util/Jamfile index 84a73c7107..09427e5c04 100644 --- a/src/apps/debuganalyzer/util/Jamfile +++ b/src/apps/debuganalyzer/util/Jamfile @@ -9,5 +9,4 @@ UseHeaders $(HAIKU_DEBUG_ANALYZER_HEADERS) ; MergeObject DebugAnalyzer_util.o : DataSource.cpp - Variant.cpp ; diff --git a/src/apps/debugger/Jamfile b/src/apps/debugger/Jamfile index 1a45a595c1..9bdf98c12b 100644 --- a/src/apps/debugger/Jamfile +++ b/src/apps/debugger/Jamfile @@ -16,7 +16,6 @@ local debugAnalyzerSources SubDirHdrs [ FDirName $(HAIKU_TOP) src bin debug ] ; SubDirHdrs [ FDirName $(debugAnalyzerSources) gui ] ; -SubDirHdrs [ FDirName $(debugAnalyzerSources) util ] ; Application Debugger : Debugger.cpp @@ -54,9 +53,6 @@ Application Debugger : TeamWindow.cpp ThreadListView.cpp - # DebugAnalyzer:util - Variant.cpp - # DWARF # attribute_classes.cpp # AttributeValue.cpp @@ -71,6 +67,7 @@ Application Debugger : debug_utils.a libcolumnlistview.a + libshared.a $(TARGET_LIBSTDC++) be debug @@ -78,7 +75,4 @@ Application Debugger : : Debugger.rdef ; -SEARCH on [ FGristFiles Variant.cpp ] - = [ FDirName $(debugAnalyzerSources) util ] ; - HaikuSubInclude gui running_teams_window ; diff --git a/src/apps/debugger/arch/CpuState.h b/src/apps/debugger/arch/CpuState.h index 28944f7b92..79f2c8f135 100644 --- a/src/apps/debugger/arch/CpuState.h +++ b/src/apps/debugger/arch/CpuState.h @@ -8,8 +8,7 @@ #include #include - -#include "Variant.h" +#include class Register; @@ -20,7 +19,7 @@ public: virtual ~CpuState(); virtual bool GetRegisterValue(const Register* reg, - Variant& _value) = 0; + BVariant& _value) = 0; }; diff --git a/src/apps/debugger/arch/x86/CpuStateX86.cpp b/src/apps/debugger/arch/x86/CpuStateX86.cpp index 7455d0853a..fe46a915bf 100644 --- a/src/apps/debugger/arch/x86/CpuStateX86.cpp +++ b/src/apps/debugger/arch/x86/CpuStateX86.cpp @@ -43,7 +43,7 @@ CpuStateX86::~CpuStateX86() bool -CpuStateX86::GetRegisterValue(const Register* reg, Variant& _value) +CpuStateX86::GetRegisterValue(const Register* reg, BVariant& _value) { int32 index = reg->Index(); if (!IsRegisterSet(index)) diff --git a/src/apps/debugger/arch/x86/CpuStateX86.h b/src/apps/debugger/arch/x86/CpuStateX86.h index 4e176a75b4..c69670e515 100644 --- a/src/apps/debugger/arch/x86/CpuStateX86.h +++ b/src/apps/debugger/arch/x86/CpuStateX86.h @@ -47,7 +47,7 @@ public: virtual ~CpuStateX86(); virtual bool GetRegisterValue(const Register* reg, - Variant& _value); + BVariant& _value); bool IsRegisterSet(int32 index) const; uint32 IntRegisterValue(int32 index) const; diff --git a/src/apps/debugger/gui/team_window/ImageListView.cpp b/src/apps/debugger/gui/team_window/ImageListView.cpp index dc41b427d2..aa6a3b5c5d 100644 --- a/src/apps/debugger/gui/team_window/ImageListView.cpp +++ b/src/apps/debugger/gui/team_window/ImageListView.cpp @@ -97,7 +97,7 @@ public: return fImages.CountItems(); } - virtual bool GetValueAt(int32 rowIndex, int32 columnIndex, Variant& value) + virtual bool GetValueAt(int32 rowIndex, int32 columnIndex, BVariant& value) { Image* image = fImages.ItemAt(rowIndex); if (image == NULL) @@ -108,7 +108,7 @@ public: value.SetTo(image->ID()); return true; case 1: - value.SetTo(image->Name(), VARIANT_DONT_COPY_DATA); + value.SetTo(image->Name(), B_VARIANT_DONT_COPY_DATA); return true; default: return false; @@ -233,12 +233,12 @@ ImageListView::_Init() { fImagesTable = new Table("images list", 0); AddChild(fImagesTable->ToView()); - + // columns fImagesTable->AddColumn(new Int32TableColumn(0, "ID", 40, 20, 1000, B_TRUNCATE_MIDDLE, B_ALIGN_RIGHT)); fImagesTable->AddColumn(new StringTableColumn(1, "Name", 80, 40, 1000, B_TRUNCATE_END, B_ALIGN_LEFT)); - + fImagesTable->AddTableListener(this); } diff --git a/src/apps/debugger/gui/team_window/RegisterView.cpp b/src/apps/debugger/gui/team_window/RegisterView.cpp index be2fc72cae..dcf3e36a06 100644 --- a/src/apps/debugger/gui/team_window/RegisterView.cpp +++ b/src/apps/debugger/gui/team_window/RegisterView.cpp @@ -31,15 +31,15 @@ public: } protected: - virtual BField* PrepareField(const Variant& value) const + virtual BField* PrepareField(const BVariant& value) const { char buffer[64]; return StringTableColumn::PrepareField( - Variant(_ToString(value, buffer, sizeof(buffer)), - VARIANT_DONT_COPY_DATA)); + BVariant(_ToString(value, buffer, sizeof(buffer)), + B_VARIANT_DONT_COPY_DATA)); } - virtual int CompareValues(const Variant& a, const Variant& b) + virtual int CompareValues(const BVariant& a, const BVariant& b) { // If neither value is a number, compare the strings. If only one value // is a number, it is considered to be greater. @@ -49,10 +49,10 @@ protected: char bufferA[64]; char bufferB[64]; return StringTableColumn::CompareValues( - Variant(_ToString(a, bufferA, sizeof(bufferA)), - VARIANT_DONT_COPY_DATA), - Variant(_ToString(b, bufferB, sizeof(bufferB)), - VARIANT_DONT_COPY_DATA)); + BVariant(_ToString(a, bufferA, sizeof(bufferA)), + B_VARIANT_DONT_COPY_DATA), + BVariant(_ToString(b, bufferB, sizeof(bufferB)), + B_VARIANT_DONT_COPY_DATA)); } if (!b.IsNumber()) @@ -71,7 +71,7 @@ protected: } private: - const char* _ToString(const Variant& value, char* buffer, + const char* _ToString(const BVariant& value, char* buffer, size_t bufferSize) const { if (!value.IsNumber()) @@ -139,7 +139,7 @@ public: return fArchitecture->CountRegisters(); } - virtual bool GetValueAt(int32 rowIndex, int32 columnIndex, Variant& value) + virtual bool GetValueAt(int32 rowIndex, int32 columnIndex, BVariant& value) { if (rowIndex < 0 || rowIndex >= fArchitecture->CountRegisters()) return false; @@ -148,13 +148,13 @@ public: switch (columnIndex) { case 0: - value.SetTo(reg->Name(), VARIANT_DONT_COPY_DATA); + value.SetTo(reg->Name(), B_VARIANT_DONT_COPY_DATA); return true; case 1: if (fCpuState == NULL) return false; if (!fCpuState->GetRegisterValue(reg, value)) - value.SetTo("?", VARIANT_DONT_COPY_DATA); + value.SetTo("?", B_VARIANT_DONT_COPY_DATA); return true; default: return false; diff --git a/src/apps/debugger/gui/team_window/StackTraceView.cpp b/src/apps/debugger/gui/team_window/StackTraceView.cpp index 412bd7c681..e40a028eef 100644 --- a/src/apps/debugger/gui/team_window/StackTraceView.cpp +++ b/src/apps/debugger/gui/team_window/StackTraceView.cpp @@ -29,16 +29,16 @@ public: } protected: - virtual BField* PrepareField(const Variant& value) const + virtual BField* PrepareField(const BVariant& value) const { char buffer[64]; snprintf(buffer, sizeof(buffer), "%#llx", value.ToUInt64()); return StringTableColumn::PrepareField( - Variant(buffer, VARIANT_DONT_COPY_DATA)); + BVariant(buffer, B_VARIANT_DONT_COPY_DATA)); } - virtual int CompareValues(const Variant& a, const Variant& b) + virtual int CompareValues(const BVariant& a, const BVariant& b) { uint64 valueA = a.ToUInt64(); uint64 valueB = b.ToUInt64(); @@ -102,7 +102,7 @@ public: return fFrames.CountItems(); } - virtual bool GetValueAt(int32 rowIndex, int32 columnIndex, Variant& value) + virtual bool GetValueAt(int32 rowIndex, int32 columnIndex, BVariant& value) { StackFrame* frame = fFrames.ItemAt(rowIndex); if (frame == NULL) diff --git a/src/apps/debugger/gui/team_window/ThreadListView.cpp b/src/apps/debugger/gui/team_window/ThreadListView.cpp index 1fce41000a..6b001867db 100644 --- a/src/apps/debugger/gui/team_window/ThreadListView.cpp +++ b/src/apps/debugger/gui/team_window/ThreadListView.cpp @@ -97,7 +97,7 @@ public: return fThreads.CountItems(); } - virtual bool GetValueAt(int32 rowIndex, int32 columnIndex, Variant& value) + virtual bool GetValueAt(int32 rowIndex, int32 columnIndex, BVariant& value) { Thread* thread = fThreads.ItemAt(rowIndex); if (thread == NULL) @@ -108,7 +108,7 @@ public: value.SetTo(thread->ID()); return true; case 1: - value.SetTo(thread->Name(), VARIANT_DONT_COPY_DATA); + value.SetTo(thread->Name(), B_VARIANT_DONT_COPY_DATA); return true; default: return false; diff --git a/src/kits/shared/Jamfile b/src/kits/shared/Jamfile index 13adeb3666..65572de793 100644 --- a/src/kits/shared/Jamfile +++ b/src/kits/shared/Jamfile @@ -20,4 +20,5 @@ StaticLibrary libshared.a : DragTrackingFilter.cpp HashString.cpp RWLockManager.cpp + Variant.cpp ; diff --git a/src/apps/debuganalyzer/util/Variant.cpp b/src/kits/shared/Variant.cpp similarity index 72% rename from src/apps/debuganalyzer/util/Variant.cpp rename to src/kits/shared/Variant.cpp index 767d6d5a3c..8ca9fd9e44 100644 --- a/src/apps/debuganalyzer/util/Variant.cpp +++ b/src/kits/shared/Variant.cpp @@ -3,7 +3,7 @@ * Distributed under the terms of the MIT License. */ -#include "Variant.h" +#include #include #include @@ -11,7 +11,7 @@ template inline NumberType -Variant::_ToNumber() const +BVariant::_ToNumber() const { switch (fType) { case B_INT8_TYPE: @@ -40,16 +40,16 @@ Variant::_ToNumber() const } -Variant::~Variant() +BVariant::~BVariant() { Unset(); } void -Variant::Unset() +BVariant::Unset() { - if ((fFlags & VARIANT_OWNS_DATA) != 0) { + if ((fFlags & B_VARIANT_OWNS_DATA) != 0) { switch (fType) { case B_STRING_TYPE: free(fString); @@ -65,7 +65,7 @@ Variant::Unset() bool -Variant::IsNumber() const +BVariant::IsNumber() const { switch (fType) { case B_INT8_TYPE: @@ -86,7 +86,7 @@ Variant::IsNumber() const bool -Variant::IsInteger() const +BVariant::IsInteger() const { switch (fType) { case B_INT8_TYPE: @@ -105,7 +105,7 @@ Variant::IsInteger() const bool -Variant::IsFloat() const +BVariant::IsFloat() const { switch (fType) { case B_FLOAT_TYPE: @@ -118,110 +118,110 @@ Variant::IsFloat() const int8 -Variant::ToInt8() const +BVariant::ToInt8() const { return _ToNumber(); } uint8 -Variant::ToUInt8() const +BVariant::ToUInt8() const { return _ToNumber(); } int16 -Variant::ToInt16() const +BVariant::ToInt16() const { return _ToNumber(); } uint16 -Variant::ToUInt16() const +BVariant::ToUInt16() const { return _ToNumber(); } int32 -Variant::ToInt32() const +BVariant::ToInt32() const { return _ToNumber(); } uint32 -Variant::ToUInt32() const +BVariant::ToUInt32() const { return _ToNumber(); } int64 -Variant::ToInt64() const +BVariant::ToInt64() const { return _ToNumber(); } uint64 -Variant::ToUInt64() const +BVariant::ToUInt64() const { return _ToNumber(); } float -Variant::ToFloat() const +BVariant::ToFloat() const { return _ToNumber(); } double -Variant::ToDouble() const +BVariant::ToDouble() const { return _ToNumber(); } void* -Variant::ToPointer() const +BVariant::ToPointer() const { return fType == B_POINTER_TYPE ? fString : NULL; } const char* -Variant::ToString() const +BVariant::ToString() const { return fType == B_STRING_TYPE ? fString : NULL; } void -Variant::_SetTo(const Variant& other) +BVariant::_SetTo(const BVariant& other) { - if ((other.fFlags & VARIANT_OWNS_DATA) != 0) { + if ((other.fFlags & B_VARIANT_OWNS_DATA) != 0) { switch (other.fType) { case B_STRING_TYPE: fType = B_STRING_TYPE; fString = strdup(other.fString); - fFlags = VARIANT_OWNS_DATA; + fFlags = B_VARIANT_OWNS_DATA; return; default: break; } } - memcpy(this, &other, sizeof(Variant)); + memcpy(this, &other, sizeof(BVariant)); } void -Variant::_SetTo(int8 value) +BVariant::_SetTo(int8 value) { fType = B_INT8_TYPE; fFlags = 0; @@ -230,7 +230,7 @@ Variant::_SetTo(int8 value) void -Variant::_SetTo(uint8 value) +BVariant::_SetTo(uint8 value) { fType = B_UINT8_TYPE; fFlags = 0; @@ -239,7 +239,7 @@ Variant::_SetTo(uint8 value) void -Variant::_SetTo(int16 value) +BVariant::_SetTo(int16 value) { fType = B_INT16_TYPE; fFlags = 0; @@ -248,7 +248,7 @@ Variant::_SetTo(int16 value) void -Variant::_SetTo(uint16 value) +BVariant::_SetTo(uint16 value) { fType = B_UINT16_TYPE; fFlags = 0; @@ -257,7 +257,7 @@ Variant::_SetTo(uint16 value) void -Variant::_SetTo(int32 value) +BVariant::_SetTo(int32 value) { fType = B_INT32_TYPE; fFlags = 0; @@ -266,7 +266,7 @@ Variant::_SetTo(int32 value) void -Variant::_SetTo(uint32 value) +BVariant::_SetTo(uint32 value) { fType = B_UINT32_TYPE; fFlags = 0; @@ -275,7 +275,7 @@ Variant::_SetTo(uint32 value) void -Variant::_SetTo(int64 value) +BVariant::_SetTo(int64 value) { fType = B_INT64_TYPE; fFlags = 0; @@ -284,7 +284,7 @@ Variant::_SetTo(int64 value) void -Variant::_SetTo(uint64 value) +BVariant::_SetTo(uint64 value) { fType = B_UINT64_TYPE; fFlags = 0; @@ -293,7 +293,7 @@ Variant::_SetTo(uint64 value) void -Variant::_SetTo(float value) +BVariant::_SetTo(float value) { fType = B_FLOAT_TYPE; fFlags = 0; @@ -302,7 +302,7 @@ Variant::_SetTo(float value) void -Variant::_SetTo(double value) +BVariant::_SetTo(double value) { fType = B_DOUBLE_TYPE; fFlags = 0; @@ -311,7 +311,7 @@ Variant::_SetTo(double value) void -Variant::_SetTo(const void* value) +BVariant::_SetTo(const void* value) { fType = B_POINTER_TYPE; fFlags = 0; @@ -320,18 +320,18 @@ Variant::_SetTo(const void* value) void -Variant::_SetTo(const char* value, uint32 flags) +BVariant::_SetTo(const char* value, uint32 flags) { fType = B_STRING_TYPE; fFlags = 0; if (value != NULL) { - if ((flags & VARIANT_DONT_COPY_DATA) == 0) { + if ((flags & B_VARIANT_DONT_COPY_DATA) == 0) { fString = strdup(value); - fFlags |= VARIANT_OWNS_DATA; + fFlags |= B_VARIANT_OWNS_DATA; } else { fString = (char*)value; - fFlags |= flags & VARIANT_OWNS_DATA; + fFlags |= flags & B_VARIANT_OWNS_DATA; } } else fString = NULL;