rbutil: Rework and merge player and build server info handling.

Handling the data for players from rbutil.ini and the build-info data
from the server is closely related. Splitting things up into different
classes only creates tightly coupling, which is unnecessary, and the
need to differentiate between them in the application.

Merge both classes into a single one and rework handling so the
application doesn't have to deal with two separate classes anymore.

Furthermore, change URL templates to use new values from build-info
instead of hard coding them.

Change-Id: Ica550973ce23d1559110782add52bc214eba552d

1 files changed, 2 insertions, 2 deletions

diff --git a/rbutil/rbutilqt/rbutilqt.pri b/rbutil/rbutilqt/rbutilqt.pri
index c8f60052c4..bf127819fd 100644
--- a/rbutil/rbutilqt/rbutilqt.pri
+++ b/rbutil/rbutilqt/rbutilqt.pri
@@ -48,7 +48,6 @@ SOURCES += \
  base/voicefile.cpp \
  createvoicewindow.cpp \
  base/rbsettings.cpp \
- base/serverinfo.cpp \
  base/systeminfo.cpp \
  base/system.cpp \
  sysinfo.cpp \
@@ -82,6 +81,7 @@ SOURCES += \
  mspack/system-mspack.c \
  base/mspackutil.cpp \
  base/archiveutil.cpp \
+ base/playerbuildinfo.cpp
 
 
 HEADERS += \
@@ -127,7 +127,6 @@ HEADERS += \
  base/voicefile.h \
  createvoicewindow.h \
  base/rbsettings.h \
- base/serverinfo.h \
  base/systeminfo.h \
  sysinfo.h \
  base/system.h \
@@ -173,6 +172,7 @@ HEADERS += \
  mspack/szdd.h \
  base/mspackutil.h \
  base/archiveutil.h \
+ base/playerbuildinfo.h
 
 
 FORMS += \