[haiku-commits] r37516 - in haiku/trunk/src: apps/deskbar kits/tracker

Author: aldeck
Date: 2010-07-14 17:32:00 +0200 (Wed, 14 Jul 2010)
New Revision: 37516
Changeset: http://dev.haiku-os.org/changeset/37516

Modified:
   haiku/trunk/src/apps/deskbar/Jamfile
   haiku/trunk/src/kits/tracker/EntryIterator.cpp
   haiku/trunk/src/kits/tracker/EntryIterator.h
   haiku/trunk/src/kits/tracker/FavoritesMenu.cpp
   haiku/trunk/src/kits/tracker/FindPanel.cpp
   haiku/trunk/src/kits/tracker/FindPanel.h
   haiku/trunk/src/kits/tracker/Jamfile
   haiku/trunk/src/kits/tracker/NodeWalker.h
   haiku/trunk/src/kits/tracker/OpenWithWindow.cpp
   haiku/trunk/src/kits/tracker/OpenWithWindow.h
   haiku/trunk/src/kits/tracker/PoseView.cpp
Log:
* Removed last remains of the OPEN_TRACKER define.
* Cleanup of unused include.


Modified: haiku/trunk/src/apps/deskbar/Jamfile
===================================================================
--- haiku/trunk/src/apps/deskbar/Jamfile        2010-07-14 13:56:54 UTC (rev 
37515)
+++ haiku/trunk/src/apps/deskbar/Jamfile        2010-07-14 15:32:00 UTC (rev 
37516)
@@ -6,7 +6,7 @@
 
 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 ;

Modified: haiku/trunk/src/kits/tracker/EntryIterator.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/EntryIterator.cpp      2010-07-14 13:56:54 UTC 
(rev 37515)
+++ haiku/trunk/src/kits/tracker/EntryIterator.cpp      2010-07-14 15:32:00 UTC 
(rev 37516)
@@ -44,7 +44,7 @@
 #include "ObjectList.h"
 
 
-TWalkerWrapper::TWalkerWrapper(WALKER_NS::TWalker *walker)
+TWalkerWrapper::TWalkerWrapper(BTrackerPrivate::TWalker *walker)
        :
        fWalker(walker),
        fStatus(B_OK)

Modified: haiku/trunk/src/kits/tracker/EntryIterator.h
===================================================================
--- haiku/trunk/src/kits/tracker/EntryIterator.h        2010-07-14 13:56:54 UTC 
(rev 37515)
+++ haiku/trunk/src/kits/tracker/EntryIterator.h        2010-07-14 15:32:00 UTC 
(rev 37516)
@@ -72,7 +72,7 @@
 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 @@
        virtual int32 CountEntries();
 
 protected:
-       WALKER_NS::TWalker *fWalker;
+       BTrackerPrivate::TWalker *fWalker;
        status_t fStatus;
 };
 

Modified: haiku/trunk/src/kits/tracker/FavoritesMenu.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/FavoritesMenu.cpp      2010-07-14 13:56:54 UTC 
(rev 37515)
+++ haiku/trunk/src/kits/tracker/FavoritesMenu.cpp      2010-07-14 15:32:00 UTC 
(rev 37516)
@@ -49,7 +49,6 @@
 #include <functional>
 #include <algorithm>
 
-#include "EntryIterator.h"
 #include "IconMenuItem.h"
 #include "NavMenu.h"
 #include "PoseView.h"
@@ -58,7 +57,6 @@
 #include "Utilities.h"
 
 
-
 #undef B_TRANSLATE_CONTEXT
 #define B_TRANSLATE_CONTEXT "libtracker"
 

Modified: haiku/trunk/src/kits/tracker/FindPanel.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/FindPanel.cpp  2010-07-14 13:56:54 UTC (rev 
37515)
+++ haiku/trunk/src/kits/tracker/FindPanel.cpp  2010-07-14 15:32:00 UTC (rev 
37516)
@@ -2866,7 +2866,7 @@
                state = kError;
                return;
        }
-       fWalker = new WALKER_NS::TNodeWalker(path.Path());
+       fWalker = new BTrackerPrivate::TNodeWalker(path.Path());
        state = kAllocatedWalker;
 }
 

Modified: haiku/trunk/src/kits/tracker/FindPanel.h
===================================================================
--- haiku/trunk/src/kits/tracker/FindPanel.h    2010-07-14 13:56:54 UTC (rev 
37515)
+++ haiku/trunk/src/kits/tracker/FindPanel.h    2010-07-14 15:32:00 UTC (rev 
37516)
@@ -343,7 +343,7 @@
                bool ProcessOneRef(Model *);
 
        private:
-               WALKER_NS::TNodeWalker *fWalker;
+               BTrackerPrivate::TNodeWalker *fWalker;
 };
 
 

Modified: haiku/trunk/src/kits/tracker/Jamfile
===================================================================
--- haiku/trunk/src/kits/tracker/Jamfile        2010-07-14 13:56:54 UTC (rev 
37515)
+++ haiku/trunk/src/kits/tracker/Jamfile        2010-07-14 15:32:00 UTC (rev 
37516)
@@ -10,7 +10,7 @@
 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

Modified: haiku/trunk/src/kits/tracker/NodeWalker.h
===================================================================
--- haiku/trunk/src/kits/tracker/NodeWalker.h   2010-07-14 13:56:54 UTC (rev 
37515)
+++ haiku/trunk/src/kits/tracker/NodeWalker.h   2010-07-14 15:32:00 UTC (rev 
37516)
@@ -32,14 +32,6 @@
 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 @@
 #include "ObjectList.h"
 
 namespace BTrackerPrivate {
-#define WALKER_NS BTrackerPrivate
 
 
 class TWalker : public BEntryList {
@@ -185,5 +176,3 @@
 using namespace BTrackerPrivate;
 
 #endif // WALKER_H
-
-#endif // B_BEOS_VERSION_DANO

Modified: haiku/trunk/src/kits/tracker/OpenWithWindow.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/OpenWithWindow.cpp     2010-07-14 13:56:54 UTC 
(rev 37515)
+++ haiku/trunk/src/kits/tracker/OpenWithWindow.cpp     2010-07-14 15:32:00 UTC 
(rev 37516)
@@ -1277,7 +1277,7 @@
        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 @@
        BString lookForAppsPredicate;
        lookForAppsPredicate << "(" << kAttrAppSignature << " = \"*\" ) && ( "
                << kAttrMIMEType << " = " << B_APP_MIME_TYPE << " ) ";
-       fWalker = new WALKER_NS::TQueryWalker(lookForAppsPredicate.String());
+       fWalker = new 
BTrackerPrivate::TQueryWalker(lookForAppsPredicate.String());
 }
 
 

Modified: haiku/trunk/src/kits/tracker/OpenWithWindow.h
===================================================================
--- haiku/trunk/src/kits/tracker/OpenWithWindow.h       2010-07-14 13:56:54 UTC 
(rev 37515)
+++ haiku/trunk/src/kits/tracker/OpenWithWindow.h       2010-07-14 15:32:00 UTC 
(rev 37516)
@@ -311,7 +311,7 @@
 
        private:
                SearchForSignatureEntryList *fParent;
-               WALKER_NS::TWalker *fWalker;
+               BTrackerPrivate::TWalker *fWalker;
 };
 
 } // namespace BPrivate

Modified: haiku/trunk/src/kits/tracker/PoseView.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/PoseView.cpp   2010-07-14 13:56:54 UTC (rev 
37515)
+++ haiku/trunk/src/kits/tracker/PoseView.cpp   2010-07-14 15:32:00 UTC (rev 
37516)
@@ -75,7 +75,6 @@
 #include "DeskWindow.h"
 #include "DesktopPoseView.h"
 #include "DirMenu.h"
-#include "EntryIterator.h"
 #include "FilePanelPriv.h"
 #include "FSClipboard.h"
 #include "FSUtils.h"


Other related posts:

  • » [haiku-commits] r37516 - in haiku/trunk/src: apps/deskbar kits/tracker - alex