Webversion compiles locally

K3OpEenRijDesktop.pro

@@ -1,12 +1,27 @@
-include(../RibiLibraries/DesktopApplicationNoWeffcpp.pri)
-include(../RibiLibraries/Boost.pri)
+CONFIG += c++14
+QMAKE_CXX = g++-5
+QMAKE_LINK = g++-5
+QMAKE_CC = gcc-5
+QMAKE_CXXFLAGS += -Wall -Wextra -Werror -std=c++14
+
+CONFIG += debug_and_release
+
+QT       += core gui
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+TEMPLATE = app
+
+CONFIG(release, debug|release) {
+  message(Release mode)
+  DEFINES += NDEBUG
+}
 
 include(../RibiClasses/CppAbout/CppAbout.pri)
 include(../RibiClasses/CppFileIo/CppFileIo.pri)
 include(../RibiClasses/CppHelp/CppHelp.pri)
 include(../RibiClasses/CppMenuDialog/CppMenuDialog.pri)
-
-include(../RibiLibraries/GeneralDesktop.pri)
+include(../RibiClasses/CppQtAboutDialog/CppQtAboutDialog.pri)
+include(../RibiClasses/CppQtHideAndShowDialog/CppQtHideAndShowDialog.pri)
 
 #Specific, console
 include(../DotMatrix/DotMatrix.pri)

K3OpEenRijWebsite.pro

@@ -42,10 +42,7 @@ include(../ConnectThree/ConnectThree.pri)
 include(../ConnectThree/ConnectThreeWidget.pri)
 include(../ConnectThree/WtConnectThreeWidget.pri)
 include(../RibiClasses/CppTribool/CppTribool.pri)
-
-#Specific, web
 include(K3OpEenRijWebsite.pri)
-include(../RibiClasses/CppWtConnectThreeWidget/CppWtConnectThreeWidget.pri)
 include(../ConnectThree/ConnectThreeWebsite.pri)
 
 SOURCES += wtmain.cpp

wtmain.cpp

@@ -16,31 +16,57 @@
 
 namespace ribi {
 
+ribi::con3::Resources Convert(const ribi::koer::QtK3OpEenRijResources& r)
+{
+  return ribi::con3::Resources(
+    r.GetComputerFilenames(),
+    r.GetComputerGreyFilename(),
+    r.GetCss(),
+    r.GetEmptyFilename(),
+    r.GetIconFilename(),
+    r.GetInstructionsGoodFilenames(),
+    r.GetInstructionsWrongFilename(),
+    r.GetPlayerFilenames(
+      ribi::koer::BlackHairedGirl::kristel,
+      ribi::koer::BlondeGirl::kathleen,
+      ribi::koer::RedHairedGirl::karen
+    ),
+    r.GetPlayerGreyFilenames(
+      ribi::koer::BlackHairedGirl::kristel,
+      ribi::koer::BlondeGirl::kathleen,
+      ribi::koer::RedHairedGirl::karen
+    ),
+    r.GetQuitText(),
+    r.GetWinnerText()
+  );
+}
+
+
 struct K3OpEenRijApplication : public Wt::WApplication
 {
   K3OpEenRijApplication(
     const Wt::WEnvironment& env,
-    const ribi::con3::Resources& resources)
+    const ribi::koer::QtK3OpEenRijResources& resources)
     : Wt::WApplication(env)
   {
     this->setTitle("K3OpEenRij");
     this->useStyleSheet(resources.GetCss());
-    root()->addWidget(new ribi::con3::WtMenuDialog(resources));
+    root()->addWidget(new ribi::con3::WtMenuDialog(Convert(resources)));
   }
 };
 
 } //namespace ribi
 
 Wt::WApplication * createApplication(const Wt::WEnvironment& env)
 {
-  ribi::con3::Resources resources;
+  ribi::koer::QtK3OpEenRijResources resources;
   return new ribi::K3OpEenRijApplication(env,resources);
 }
 
 int main(int argc, char **argv)
 {
   ribi::WtAutoConfig::SaveDefaultStylesheet();
-  ribi::WtAutoConfig a(argc,argv,createApplication);
+  ribi::WtAutoConfig a(argc, argv, createApplication);
   return a.Run();
 }