* Removed last remains of the OPEN_TRACKER define.

* Cleanup of unused include.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37516 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/apps/deskbar/Jamfile

@@ -6,7 +6,7 @@ SubDirHdrs $(HAIKU_TOP) src kits tracker ;
 
 AddResources Deskbar : Deskbar.rdef icon-freelogo.rdef icons.rdef ;
 
-SubDirC++Flags -DDB_ADDONS -DOPEN_TRACKER=1
+SubDirC++Flags -DDB_ADDONS
 	-D_INCLUDES_CLASS_DEVICE_MAP=1
 	-D_SUPPORTS_RESOURCES=1
 	-D_SUPPORTS_FEATURE_SCRIPTING=1 ;

src/kits/tracker/EntryIterator.cpp

@@ -44,7 +44,7 @@ All rights reserved.
 #include "ObjectList.h"
 
 
-TWalkerWrapper::TWalkerWrapper(WALKER_NS::TWalker *walker)
+TWalkerWrapper::TWalkerWrapper(BTrackerPrivate::TWalker *walker)
 	:
 	fWalker(walker),
 	fStatus(B_OK)

src/kits/tracker/EntryIterator.h

@@ -72,7 +72,7 @@ protected:
 class TWalkerWrapper : public EntryListBase {
 	// this is to be able to use TWalker polymorfically as BEntryListBase
 public:
-	TWalkerWrapper(WALKER_NS::TWalker *walker);
+	TWalkerWrapper(BTrackerPrivate::TWalker *walker);
 	virtual ~TWalkerWrapper();
 
 	virtual status_t InitCheck() const;
@@ -84,7 +84,7 @@ public:
 	virtual int32 CountEntries();
 
 protected:
-	WALKER_NS::TWalker *fWalker;
+	BTrackerPrivate::TWalker *fWalker;
 	status_t fStatus;
 };
 

src/kits/tracker/FavoritesMenu.cpp

@@ -49,7 +49,6 @@ All rights reserved.
 #include <functional>
 #include <algorithm>
 
-#include "EntryIterator.h"
 #include "IconMenuItem.h"
 #include "NavMenu.h"
 #include "PoseView.h"
@@ -58,7 +57,6 @@ All rights reserved.
 #include "Utilities.h"
 
 
-
 #undef B_TRANSLATE_CONTEXT
 #define B_TRANSLATE_CONTEXT "libtracker"
 

src/kits/tracker/FindPanel.cpp

@@ -2866,7 +2866,7 @@ DeleteTransientQueriesTask::Initialize()
 		state = kError;
 		return;
 	}
-	fWalker = new WALKER_NS::TNodeWalker(path.Path());
+	fWalker = new BTrackerPrivate::TNodeWalker(path.Path());
 	state = kAllocatedWalker;
 }
 

src/kits/tracker/FindPanel.h

@@ -343,7 +343,7 @@ class DeleteTransientQueriesTask {
 		bool ProcessOneRef(Model *);
 
 	private:
-		WALKER_NS::TNodeWalker *fWalker;
+		BTrackerPrivate::TNodeWalker *fWalker;
 };
 
 

src/kits/tracker/Jamfile

@@ -10,7 +10,7 @@ UseLibraryHeaders icon ;
 AddResources libtracker.so : TrackerIcons.rdef libtracker.rdef ;
 
 SubDirC++Flags
-	-D_BUILDING_tracker=1 -DOPEN_TRACKER=1
+	-D_BUILDING_tracker=1
 #	-D_INCLUDES_CLASS_DEVICE_MAP=1
 	-D_SUPPORTS_RESOURCES=1
 	-D_SUPPORTS_FEATURE_SCRIPTING=1

src/kits/tracker/NodeWalker.h

@@ -32,14 +32,6 @@ names are registered trademarks or trademarks of their respective holders.
 All rights reserved.
 */
 
-#if !OPEN_TRACKER
-
-#include <private/storage/walker.h>
-
-#define WALKER_NS
-
-#else
-
 #ifndef WALKER_H
 #define WALKER_H
 
@@ -57,7 +49,6 @@ All rights reserved.
 #include "ObjectList.h"
 
 namespace BTrackerPrivate {
-#define WALKER_NS BTrackerPrivate
 
 
 class TWalker : public BEntryList {
@@ -185,5 +176,3 @@ private:
 using namespace BTrackerPrivate;
 
 #endif	// WALKER_H
-
-#endif	// B_BEOS_VERSION_DANO

src/kits/tracker/OpenWithWindow.cpp

@@ -1277,7 +1277,7 @@ SearchForSignatureEntryList::Rewind()
 	ASSERT(predicateString.Length());
 // 	PRINT(("query predicate %s\n", predicateString.String()));
 	fIteratorList->AddItem(new TWalkerWrapper(
-		new WALKER_NS::TQueryWalker(predicateString.String())));
+		new BTrackerPrivate::TQueryWalker(predicateString.String())));
 	fIteratorList->AddItem(new ConditionalAllAppsIterator(this));
 
 	return fIteratorList->Rewind();
@@ -1609,7 +1609,7 @@ ConditionalAllAppsIterator::Instantiate()
 	BString lookForAppsPredicate;
 	lookForAppsPredicate << "(" << kAttrAppSignature << " = \"*\" ) && ( "
 		<< kAttrMIMEType << " = " << B_APP_MIME_TYPE << " ) ";
-	fWalker = new WALKER_NS::TQueryWalker(lookForAppsPredicate.String());
+	fWalker = new BTrackerPrivate::TQueryWalker(lookForAppsPredicate.String());
 }
 
 

src/kits/tracker/OpenWithWindow.h

@@ -311,7 +311,7 @@ class ConditionalAllAppsIterator : public EntryListBase {
 
 	private:
 		SearchForSignatureEntryList *fParent;
-		WALKER_NS::TWalker *fWalker;
+		BTrackerPrivate::TWalker *fWalker;
 };
 
 } // namespace BPrivate

src/kits/tracker/PoseView.cpp

@@ -75,7 +75,6 @@ All rights reserved.
 #include "DeskWindow.h"
 #include "DesktopPoseView.h"
 #include "DirMenu.h"
-#include "EntryIterator.h"
 #include "FilePanelPriv.h"
 #include "FSClipboard.h"
 #include "FSUtils.h"