strip out unfinished product, review and market stuff,

enable _() instead of wxT() in uiproject.fbp so it uses wxGetTranslation for the wxFormBuilder generated part of the UI

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@64 1a98c847-1fd6-4fd8-948a-caf3550aa51b

db.cpp

@@ -507,27 +507,6 @@ bool LoadAddresses()
 
 
 
-//
-// CReviewDB
-//
-
-bool CReviewDB::ReadReviews(uint256 hash, vector<CReview>& vReviews)
-{
-    vReviews.size(); // msvc workaround, just need to do anything with vReviews
-    return Read(make_pair(string("reviews"), hash), vReviews);
-}
-
-bool CReviewDB::WriteReviews(uint256 hash, const vector<CReview>& vReviews)
-{
-    return Write(make_pair(string("reviews"), hash), vReviews);
-}
-
-
-
-
-
-
-
 //
 // CWalletDB
 //

db.h

@@ -285,45 +285,6 @@ class CTxDB : public CDB
 
 
 
-class CReviewDB : public CDB
-{
-public:
-    CReviewDB(const char* pszMode="r+") : CDB("reviews.dat", pszMode) { }
-private:
-    CReviewDB(const CReviewDB&);
-    void operator=(const CReviewDB&);
-public:
-    bool ReadUser(uint256 hash, CUser& user)
-    {
-        return Read(make_pair(string("user"), hash), user);
-    }
-
-    bool WriteUser(uint256 hash, const CUser& user)
-    {
-        return Write(make_pair(string("user"), hash), user);
-    }
-
-    bool ReadReviews(uint256 hash, vector<CReview>& vReviews);
-    bool WriteReviews(uint256 hash, const vector<CReview>& vReviews);
-};
-
-
-
-
-
-class CMarketDB : public CDB
-{
-public:
-    CMarketDB(const char* pszMode="r+") : CDB("market.dat", pszMode) { }
-private:
-    CMarketDB(const CMarketDB&);
-    void operator=(const CMarketDB&);
-};
-
-
-
-
-
 class CAddrDB : public CDB
 {
 public:

headers.h

@@ -99,7 +99,6 @@ using namespace boost;
 #include "net.h"
 #include "irc.h"
 #include "main.h"
-#include "market.h"
 #include "rpc.h"
 #include "uibase.h"
 #include "ui.h"

main.cpp

@@ -1706,10 +1706,8 @@ bool AlreadyHave(CTxDB& txdb, const CInv& inv)
 {
     switch (inv.type)
     {
-    case MSG_TX:        return mapTransactions.count(inv.hash) || txdb.ContainsTx(inv.hash);
-    case MSG_BLOCK:     return mapBlockIndex.count(inv.hash) || mapOrphanBlocks.count(inv.hash);
-    case MSG_REVIEW:    return true;
-    case MSG_PRODUCT:   return mapProducts.count(inv.hash);
+    case MSG_TX:    return mapTransactions.count(inv.hash) || txdb.ContainsTx(inv.hash);
+    case MSG_BLOCK: return mapBlockIndex.count(inv.hash) || mapOrphanBlocks.count(inv.hash);
     }
     // Don't know what it is, just say we already got one
     return true;
@@ -2108,24 +2106,6 @@ bool ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
     }
 
 
-    else if (strCommand == "review")
-    {
-        CDataStream vMsg(vRecv);
-        CReview review;
-        vRecv >> review;
-
-        CInv inv(MSG_REVIEW, review.GetHash());
-        pfrom->AddInventoryKnown(inv);
-
-        if (review.AcceptReview())
-        {
-            // Relay the original message as-is in case it's a higher version than we know how to parse
-            RelayMessage(inv, vMsg);
-            mapAlreadyAskedFor.erase(inv);
-        }
-    }
-
-
     else if (strCommand == "block")
     {
         auto_ptr<CBlock> pblock(new CBlock);

makefile

@@ -25,7 +25,7 @@ LIBS= \
  -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l shlwapi
 WXDEFS=-DWIN32 -D__WXMSW__ -D_WINDOWS -DNOPCH
 CFLAGS=-mthreads -O0 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(WXDEFS) $(INCLUDEPATHS)
-HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h script.h db.h net.h irc.h main.h market.h rpc.h uibase.h ui.h
+HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h
 
 
 
@@ -50,9 +50,6 @@ obj/net.o: net.cpp                  $(HEADERS)
 obj/main.o: main.cpp                $(HEADERS) sha.h
 	g++ -c $(CFLAGS) -o $@ $<
 
-obj/market.o: market.cpp            $(HEADERS)
-	g++ -c $(CFLAGS) -o $@ $<
-
 obj/ui.o: ui.cpp                    $(HEADERS)
 	g++ -c $(CFLAGS) -o $@ $<
 
@@ -73,7 +70,7 @@ obj/ui_res.o: ui.rc  rc/bitcoin.ico rc/check.ico rc/send16.bmp rc/send16mask.bmp
 
 
 
-OBJS=obj/util.o obj/script.o obj/db.o obj/net.o obj/main.o obj/market.o \
+OBJS=obj/util.o obj/script.o obj/db.o obj/net.o obj/main.o \
         obj/ui.o obj/uibase.o obj/sha.o obj/irc.o obj/rpc.o \
         obj/ui_res.o
 

makefile.unix.wx2.8

@@ -35,7 +35,7 @@ LIBS= \
 
 WXDEFS=-D__WXGTK__ -DNOPCH
 CFLAGS=-O0 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(WXDEFS) $(INCLUDEPATHS)
-HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h script.h db.h net.h irc.h main.h market.h rpc.h uibase.h ui.h
+HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h
 
 
 
@@ -60,9 +60,6 @@ obj/net.o: net.cpp                  $(HEADERS)
 obj/main.o: main.cpp                $(HEADERS) sha.h
 	g++ -c $(CFLAGS) -o $@ $<
 
-obj/market.o: market.cpp            $(HEADERS)
-	g++ -c $(CFLAGS) -o $@ $<
-
 obj/ui.o: ui.cpp                    $(HEADERS)
 	g++ -c $(CFLAGS) -o $@ $<
 
@@ -80,7 +77,7 @@ obj/rpc.o: rpc.cpp                  $(HEADERS)
 
 
 
-OBJS=obj/util.o obj/script.o obj/db.o obj/net.o obj/main.o obj/market.o \
+OBJS=obj/util.o obj/script.o obj/db.o obj/net.o obj/main.o \
         obj/ui.o obj/uibase.o obj/sha.o obj/irc.o obj/rpc.o
 
 bitcoin: headers.h.gch $(OBJS)

makefile.unix.wx2.9

@@ -35,7 +35,7 @@ LIBS= \
 
 WXDEFS=-D__WXGTK__ -DNOPCH
 CFLAGS=-O0 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(WXDEFS) $(INCLUDEPATHS)
-HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h script.h db.h net.h irc.h main.h market.h rpc.h uibase.h ui.h
+HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h
 
 
 
@@ -60,9 +60,6 @@ obj/net.o: net.cpp                  $(HEADERS)
 obj/main.o: main.cpp                $(HEADERS) sha.h
 	g++ -c $(CFLAGS) -o $@ $<
 
-obj/market.o: market.cpp            $(HEADERS)
-	g++ -c $(CFLAGS) -o $@ $<
-
 obj/ui.o: ui.cpp                    $(HEADERS)
 	g++ -c $(CFLAGS) -o $@ $<
 
@@ -80,7 +77,7 @@ obj/rpc.o: rpc.cpp                  $(HEADERS)
 
 
 
-OBJS=obj/util.o obj/script.o obj/db.o obj/net.o obj/main.o obj/market.o \
+OBJS=obj/util.o obj/script.o obj/db.o obj/net.o obj/main.o \
         obj/ui.o obj/uibase.o obj/sha.o obj/irc.o obj/rpc.o
 
 bitcoin: headers.h.gch $(OBJS)

makefile.vc

@@ -23,7 +23,7 @@ LIBS= \
     kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib ws2_32.lib shlwapi.lib
 WXDEFS=/DWIN32 /D__WXMSW__ /D_WINDOWS /DNOPCH
 CFLAGS=/c /nologo /Ob0 /MD$(D) /EHsc /GR /Zm300 $(DEBUGFLAGS) $(WXDEFS) $(INCLUDEPATHS)
-HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h script.h db.h net.h irc.h main.h market.h rpc.h uibase.h ui.h
+HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h
 
 
 
@@ -45,9 +45,6 @@ obj\net.obj: net.cpp          $(HEADERS)
 obj\main.obj: main.cpp        $(HEADERS) sha.h
     cl $(CFLAGS) /Fo$@ %s
 
-obj\market.obj: market.cpp    $(HEADERS)
-    cl $(CFLAGS) /Fo$@ %s
-
 obj\ui.obj: ui.cpp            $(HEADERS)
     cl $(CFLAGS) /Fo$@ %s
 
@@ -68,7 +65,7 @@ obj\ui.res: ui.rc  rc/bitcoin.ico rc/check.ico rc/send16.bmp rc/send16mask.bmp r
 
 
 
-OBJS=obj\util.obj obj\script.obj obj\db.obj obj\net.obj obj\main.obj obj\market.obj \
+OBJS=obj\util.obj obj\script.obj obj\db.obj obj\net.obj obj\main.obj \
     obj\ui.obj obj\uibase.obj obj\sha.obj obj\irc.obj obj\rpc.obj \
     obj\ui.res