Merge pull request #4 from OscarL/haiku-fixes

Fix compilation, add stubbed out version of missing source files.

Common/Support/BarberPole.cpp

@@ -0,0 +1,64 @@
+#include "BarberPole.h"
+
+
+BarberPole::BarberPole(BRect pRect, const char *pName, uint32 resizingMode, uint32 flags, int pDirection)
+		: BView(pRect, pName, resizingMode, flags) {
+
+	spinning_thread_id = spawn_thread(spinningThread, pName, B_DISPLAY_PRIORITY, this);
+	is_running = false;
+	direction = pDirection;
+};
+
+BarberPole::~BarberPole(){
+	kill_thread(spinning_thread_id);
+}
+
+void BarberPole::Start(){
+	resume_thread(spinning_thread_id); 
+	is_running = true;
+}
+
+void BarberPole::Stop(){
+	suspend_thread(spinning_thread_id); 
+	is_running = false;
+}
+
+bool BarberPole::IsRunning(){
+	return is_running;
+}
+
+int32 BarberPole::spinningThread(void *data){
+	BarberPole	*lBarberPole = (BarberPole*)data;
+	pattern		lStripes;
+
+	lStripes.data[0] = 0x0f;
+	lStripes.data[1] = 0x1e;
+	lStripes.data[2] = 0x3c;
+	lStripes.data[3] = 0x78;
+	lStripes.data[4] = 0xf0;
+	lStripes.data[5] = 0xe1;
+	lStripes.data[6] = 0xc3;
+	lStripes.data[7] = 0x87;	
+
+	while(1==1){
+		lBarberPole->LockLooper();
+		lBarberPole->FillRect(lBarberPole->Bounds(), lStripes);
+		lBarberPole->UnlockLooper();
+
+		if(lBarberPole->direction == FROM_RIGHT_TO_LEFT){
+			uchar tmp = lStripes.data[0];
+			for (int j = 0; j < 7; ++j) {
+	  			lStripes.data[j] = lStripes.data[j+1];
+			}
+			lStripes.data[7] = tmp;
+		} else {
+			uchar tmp = lStripes.data[7];
+			for (int j = 7; j > 0; --j) {
+	  			lStripes.data[j] = lStripes.data[j-1];
+			}
+			lStripes.data[0] = tmp;
+
+		}
+		snooze(25000);
+	}
+};

Common/Support/BarberPole.h

@@ -0,0 +1,28 @@
+#ifndef _BARBERPOLE_H_
+#define _BARBERPOLE_H_
+
+#include <View.h>
+
+const int FROM_RIGHT_TO_LEFT = 0;
+const int FROM_LEFT_TO_RIGHT = 1;
+
+class BarberPole : public BView {
+public:
+	BarberPole(BRect pRect, const char *pName, uint32 resizingMode, uint32 flags = 0, int pDirection = FROM_LEFT_TO_RIGHT);
+	~BarberPole();
+
+	void	Start();
+	void	Stop();
+
+	bool	IsRunning();
+
+protected:
+	thread_id	spinning_thread_id;
+	bool		is_running;
+
+private:
+			int		direction;
+	static 	int32 	spinningThread(void *data);
+};
+
+#endif

Common/Support/BarberPole.txt

@@ -0,0 +1,15 @@
+Dortmund, Germany.
+December, 12th 1998
+
+BarberPole is a little class, that shows this little spinning barber pole, you probably know from Net+ or the Tracker.
+
+This is V1.0 and should compile on both x86 and PPC, although I currently haven't tested it on PPC. If you want to set the color of the pole, do it by using 
+
+myBarberPol->SetHighColor(...) 
+	and 
+myBarberPole->SetLowColor(...)
+
+BarberPole is Freeware. If you made any changes, please report it to me, so I could update it.
+
+[email protected] 	// 	Member of DeBUG - German Be User Group
+						//	http://www.BeUserGroup.de

Common/Support/DragNDrop.h

@@ -3,6 +3,7 @@
 
 #include <Rect.h>
 #include <Message.h>
+#include <View.h>
 
 /*
  *       Class: RefDragMessage

Common/Support/Scripter.cpp

@@ -40,7 +40,7 @@ Scripter :: Scripter( const char * s, property_info* pi )
 		fprintf( stderr, "Created Scripter (%p) as\n\
 Suite: %s\n\
 property_info *: %p\n\
-Default Options: %lu\n", this, fSuite, pi, fOptions ) ;
+Default Options: %" B_PRIu32 "\n", this, fSuite, pi, fOptions ) ;
 	}
 }
 
@@ -55,7 +55,7 @@ Scripter :: Scripter( const char * s, property_info* pi, uint32 opt )
 		fprintf( stderr, "Created Scripter (%p) as\n\
 Suite: %s\n\
 property_info *: %p\n\
-Set Options: %lu\n", this, fSuite, pi, fOptions ) ;
+Set Options: %" B_PRIu32 "\n", this, fSuite, pi, fOptions ) ;
 	}
 }
 
@@ -138,7 +138,7 @@ int32 Scripter :: FindMatch( BMessage * m, int32 i,
 	int32 idx = fPropInfo.FindMatch( m, i, s, w, prop) ;
 
 	if( fOptions & PrintDebug )
-		fprintf( stderr, "Match for %s is %ld (%p)\n", prop, idx, this ) ;
+		fprintf( stderr, "Match for %s is %" B_PRId32 " (%p)\n", prop, idx, this ) ;
 
 	// clean up
 	delete[] buff ;

Common/Support/Support.cpp

@@ -251,10 +251,6 @@ char * StringUtils:: VerboseErrorString( status_t e , char * str )
 			strcpy( str, "B_FILE_ERROR " ) ;
 			break ;
 
-		case B_FILE_NOT_FOUND:
-			strcpy( str, "B_FILE_NOT_FOUND " ) ;
-			break ;
-
 		case B_FILE_EXISTS:
 			strcpy( str, "B_FILE_EXISTS " ) ;
 			break ;

Common/Support/Support.h

@@ -60,13 +60,13 @@ namespace ObjectUtils
 {
 	// Duplicates an object from another pointer
 	template <class T>
-	inline T* Dup( T* )
+	inline T* Dup( T* t )
 	{
 		return new T( *t ) ;
 	}  
 
 	template <class T>
-	inline void Swap( T& , T& )
+	inline void Swap( T& a, T& b )
 	{
 		T c = a ;
 		a = b ;

Common/Support/WindowList.cpp

@@ -93,7 +93,7 @@ void WindowList :: CloseAll( void )
 {
 	Lock() ;
 	void * v ;
-	while( (v = fList.RemoveItem( 0L )) != NULL )
+	while( (v = fList.RemoveItem( (int32)0L )) != NULL )
 	{
 		reinterpret_cast<BWindow *>( v )->Quit() ;
 	}

Common/Support/WindowList.h

@@ -17,6 +17,7 @@
  *******************************************************/
 
 #include <List.h>
+#include <Message.h>
 
 class BWindow ;
 

Common/UI/EditBox.cpp

@@ -126,28 +126,28 @@ void EditBox :: SetFloat( float f , const char * fmt )
 void  EditBox :: SetInt( int32 i )
 {
 	char str[64] ;
-	sprintf( str, "%ld", i ) ;
+	sprintf( str, "%" B_PRId32, i ) ;
 	fpTextView->SetText( str ) ;
 }
 
 void  EditBox :: SetIntOct( int32 i )
 {
 	char str[64] ;
-	sprintf( str, "%lo", i ) ;
+	sprintf( str, "%" B_PRIo32, (uint32) i ) ;
 	fpTextView->SetText( str ) ;
 }
 
 void  EditBox :: SetIntHex( int32 i )
 {
 	char str[64] ;
-	sprintf( str, "%lx", i ) ;
+	sprintf( str, "%" B_PRIx32, (uint32) i ) ;
 	fpTextView->SetText( str ) ;
 }
 
 void  EditBox :: SetIntHEX( int32 i )
 {
 	char str[64] ;
-	sprintf( str, "%lX", i ) ;
+	sprintf( str, "%" B_PRIX32, (uint32) i ) ;
 	fpTextView->SetText( str ) ;
 }
 

Common/UI/Globals.h

@@ -0,0 +1,10 @@
+// Stubbed out Globals.h for Tim Vernum's TraX.
+
+#ifndef GLOBALS_H
+#define GLOBALS_H
+
+#include "ResultsHandler.h"
+
+static ResultsHandler gResults;
+
+#endif

Common/UI/Joins.h

@@ -0,0 +1,17 @@
+// Stubbed out Joins.h for Tim Vernum's TraX.
+
+#ifndef JOINS_H
+#define JOINS_H
+
+static const char* const kOpenStrings[] = { "", "(" };
+static const char* const kCloseStrings[] = { "", ")" };
+static const char* const kNotStrings[] = { "", "not" };
+static const char* const kConjunctionStrings[] = { "", "and" };
+
+// Fixme: these are just wild guesses for now:
+static const char* const kOpenValues[] = { "", "(" };
+static const char* const kCloseValues[] = { "", ")" };
+static const char* const kNotValues[] = { "", "!" };
+static const char* const kConjunctionValues[] = { "", "&&" };
+
+#endif

Common/UI/ResultsHandler.cpp

@@ -0,0 +1,34 @@
+// Stubbed out ResultsHandler.{h,cpp} for Tim Vernum's TraX.
+
+#include "ResultsHandler.h"
+#include "ResultsWindow.h"
+
+
+ResultsHandler::ResultsHandler()
+{
+}
+
+
+void
+ResultsHandler::Init()
+{
+}
+
+
+int
+ResultsHandler::AddResult(const char* foobar)
+{
+	return ResultsWindow::AddResult(foobar);
+}
+
+
+void
+ResultsHandler::NewSearch()
+{
+}
+
+
+void
+ResultsHandler::EndSearch()
+{
+}

Common/UI/ResultsHandler.h

@@ -0,0 +1,20 @@
+// Stubbed out ResultsHandler.{h,cpp} for Tim Vernum's TraX.
+
+#ifndef RESULTSHANDLER_H
+#define RESULTSHANDLER_H
+
+
+class ResultsHandler {
+public:
+					ResultsHandler();
+
+			void	Init();
+
+			void	NewSearch();
+			void	EndSearch();
+
+	static	int		AddResult(const char*);
+};
+
+
+#endif

Common/UI/ResultsWindow.cpp

@@ -89,7 +89,7 @@ ResultsWindow :: ResultsWindow( void )
 ResultsWindow :: ~ResultsWindow( void )
 {
 	BListItem * bli ;
-	while(  (bli = fpList->RemoveItem(0L)) != NULL )
+	while ((bli = fpList->RemoveItem(static_cast<int32>(0L))) != NULL)
 		delete bli ;
 }
 
@@ -132,7 +132,7 @@ bool ResultsWindow :: QuitRequested( void )
 		}
 	}
 
-	return inherited::QuitRequested() ;
+	return BWindow::QuitRequested() ;
 }
 
 void ResultsWindow :: MessageReceived( BMessage * msg )
@@ -153,7 +153,7 @@ void ResultsWindow :: MessageReceived( BMessage * msg )
 
 		default:
 		{
-			inherited::MessageReceived( msg ) ;
+			BWindow::MessageReceived( msg ) ;
 			break ;
 		}
 	}

Common/UI/ResultsWindow.h

@@ -43,4 +43,4 @@ class ResultsWindow : public BWindow
 } ;
 
 
-#endif
+#endif

Common/UI/Settings.cpp

@@ -0,0 +1,5 @@
+// Stubbed out Settings.cpp for Tim Vernum's TraX.
+
+#include "Settings.h"
+
+TraxSettings gSettings;

Common/UI/Settings.h

@@ -0,0 +1,23 @@
+// Stubbed out Settings.h for Tim Vernum's TraX.
+
+#ifndef SETTINGS_H
+#define SETTINGS_H
+
+
+typedef struct settings {
+	enum {
+		eShowBrackets,
+		eShowJoinPanel,
+		eShowNot
+	};
+
+	int			fConjunction;
+	const char* fDefaultFolder;
+	bool		fUseTracker;
+	int			fShow;
+} TraxSettings;
+
+
+extern TraxSettings gSettings;
+
+#endif

Common/UI/SettingsWindow.cpp

@@ -0,0 +1,10 @@
+// Stubbed out SettingsWindow.{h,cpp} for Tim Vernum's TraX.
+
+#include "SettingsWindow.h"
+
+
+SettingsWindow::SettingsWindow()
+	: BWindow(BRect( 100, 100, 400, 250 ) , "Settings", B_DOCUMENT_WINDOW, B_NOT_CLOSABLE | B_NOT_RESIZABLE)
+{
+
+}