diff --git a/CMakeLists.txt b/CMakeLists.txt index 13735637..9254ef8b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -398,10 +398,6 @@ target_include_directories(${LIB_GUI_PROJECT_NAME} SYSTEM PUBLIC ${Boost_INCLUDE_DIRS} ) -# Use the Widgets module from Qt 5. -#qt5_use_modules(${LIB_GUI_PROJECT_NAME} Widgets) -#qt5_use_modules(${LIB_GUI_PROJECT_NAME} Network) - # configure platform specific include file configure_file( "${PROJECT_SOURCE_DIR}/src/lib_gui/platform_includes/includes.h.in" diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 988003d5..6745d73e 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -21,9 +21,7 @@ add_files( component/controller/BookmarkController.h component/controller/CodeController.cpp component/controller/CodeController.h - #component/controller/Controller.cpp component/controller/Controller - #component/controller/Controller.h component/controller/ErrorController.cpp component/controller/ErrorController.h component/controller/GraphController.cpp @@ -310,13 +308,6 @@ add_files( utility/commandline/commands/CommandlineCommand utility/commandline/commands/CommandlineCommandConfig utility/commandline/commands/CommandlineCommandIndex - # utility/commandline/commands/CommandlineSourceGroupOptions.h - # utility/commandline/commands/CommandlineSourceGroupOptionsC.cpp - # utility/commandline/commands/CommandlineSourceGroupOptionsC.h - # utility/commandline/commands/CommandlineSourceGroupOptionsCxx.cpp - # utility/commandline/commands/CommandlineSourceGroupOptionsCxx.h - # utility/commandline/commands/CommandlineSourceGroupOptionsJava.cpp - # utility/commandline/commands/CommandlineSourceGroupOptionsJava.h utility/file/FileInfo.cpp utility/file/FileInfo.h diff --git a/src/lib/LicenseChecker.cpp b/src/lib/LicenseChecker.cpp index 06151710..3331f819 100644 --- a/src/lib/LicenseChecker.cpp +++ b/src/lib/LicenseChecker.cpp @@ -45,7 +45,6 @@ std::string LicenseChecker::getCurrentLicenseString() const void LicenseChecker::saveCurrentLicenseString(const std::string& licenseString) const { License license; -// license.loadPublicKeyFromString(PUBLIC_KEY); bool isLoaded = license.loadFromString(licenseString); if (!isLoaded) { @@ -184,8 +183,6 @@ void LicenseChecker::handleMessage(MessageEnteredLicense* message) LicenseChecker::LicenseState LicenseChecker::checkLicense(License& license) const { -// license.loadPublicKeyFromString(PUBLIC_KEY); - if (license.isExpired()) { return LICENSE_EXPIRED; diff --git a/src/lib/utility/commandline/commands/CommandlineCommand.h b/src/lib/utility/commandline/commands/CommandlineCommand.h index 3bff9b78..290a27e8 100644 --- a/src/lib/utility/commandline/commands/CommandlineCommand.h +++ b/src/lib/utility/commandline/commands/CommandlineCommand.h @@ -1,14 +1,10 @@ -#ifndef COMMANDLINE_Command_H -#define COMMANDLINE_Command_H +#ifndef COMMANDLINE_COMMAND_H +#define COMMANDLINE_COMMAND_H #include #include #include "boost/program_options.hpp" -//#include "utility/commandline/commands/CommandlineSourceGroupOptionsC.h" -//#include "utility/commandline/commands/CommandlineSourceGroupOptionsCxx.h" -//#include "utility/commandline/commands/CommandlineSourceGroupOptionsJava.h" - namespace po = boost::program_options; namespace commandline { @@ -34,39 +30,5 @@ protected: }; } -//class CommandlineCommandAdd : public CommandlineCommand -//{ -// std::vector> m_sourceGroupTypes; -// CommandlineSourceGroupOptionsJava javaSourceGroup; - -// virtual void setup() -// { -// // ADD different sourcegroups here -// m_sourceGroupTypes.push_back(std::make_shared()); - - -// for (std::shared_ptr group : m_sourceGroupTypes) -// { -// group->setup(); -// } -// } - -// virtual void parse(int argc, char** argv) -// { -// for (std::shared_ptr group : m_sourceGroupTypes) -// { -// // 0 .. sourcetrail -// // 1 .. add -// // 2 .. sourcegrouptype -// if (argv[2] == group->name()) -// { -// group->parse(argc, argv); -// } -// } -// } -//}; - - - -#endif // !COMMANDLINE_COMMAND_H +#endif // COMMANDLINE_COMMAND_H diff --git a/src/lib/utility/commandline/commands/CommandlineCommandConfig.h b/src/lib/utility/commandline/commands/CommandlineCommandConfig.h index f0d721eb..8f07bd4e 100644 --- a/src/lib/utility/commandline/commands/CommandlineCommandConfig.h +++ b/src/lib/utility/commandline/commands/CommandlineCommandConfig.h @@ -5,10 +5,6 @@ #include #include "utility/commandline/commands/CommandlineCommand.h" -//#include "utility/commandline/commands/CommandlineSourceGroupOptionsC.h" -//#include "utility/commandline/commands/CommandlineSourceGroupOptionsCxx.h" -//#include "utility/commandline/commands/CommandlineSourceGroupOptionsJava.h" - class CommandLineParser; namespace commandline @@ -28,4 +24,4 @@ private: } // namespace cmd -#endif // !COMMANDLINE_COMMAND_H +#endif // COMMANDLINE_COMMAND_CONFIG_H diff --git a/src/lib/utility/commandline/commands/CommandlineCommandIndex.h b/src/lib/utility/commandline/commands/CommandlineCommandIndex.h index f6461acd..f3e084da 100644 --- a/src/lib/utility/commandline/commands/CommandlineCommandIndex.h +++ b/src/lib/utility/commandline/commands/CommandlineCommandIndex.h @@ -6,9 +6,6 @@ #include "utility/commandline/commands/CommandlineCommand.h" -//#include "utility/commandline/commands/CommandlineSourceGroupOptionsC.h" -//#include "utility/commandline/commands/CommandlineSourceGroupOptionsCxx.h" -//#include "utility/commandline/commands/CommandlineSourceGroupOptionsJava.h" namespace po = boost::program_options; namespace commandline { @@ -25,4 +22,4 @@ public: } // namespace cmd -#endif // !COMMANDLINE_COMMAND_H +#endif // COMMANDLINE_COMMAND_INDEX_H diff --git a/src/lib_gui/CMakeLists.txt b/src/lib_gui/CMakeLists.txt index a17ea810..7d126674 100644 --- a/src/lib_gui/CMakeLists.txt +++ b/src/lib_gui/CMakeLists.txt @@ -99,11 +99,6 @@ add_files( qt/utility/utilityQt.cpp qt/utility/utilityQt.h -# qt/utility/qctrlsignals/qctrlsignalhandler.cpp -# qt/utility/qctrlsignals/qctrlsignalhandler.h -# qt/utility/qctrlsignals/qctrlsignalhandler_p.h -# qt/utility/qctrlsignals/QCtrlSignals - qt/view/graphElements/nodeComponents/QtGraphNodeComponent.cpp qt/view/graphElements/nodeComponents/QtGraphNodeComponent.h qt/view/graphElements/nodeComponents/QtGraphNodeComponentClickable.cpp @@ -275,31 +270,9 @@ add_files( utility/path_detector/PathDetector.cpp utility/path_detector/PathDetector.h -# utility/signal_handler/SignalHandler.cpp -# utility/signal_handler/SignalHandler.h - -# utility/QtUnixSignalEmitter.cpp -# utility/QtUnixSignalEmitter.h - -# utility/SignalWatcher.cpp -# utility/SignalWatcher.h - utility/utilityApp.cpp utility/utilityApp.h utility/utilityPathDetection.cpp utility/utilityPathDetection.h ) -#if(WIN32) -#add_files( -# LIB_GUI_FILES -# qt/utility/qctrlsignals/qctrlsignalhandler_win.cpp -# qt/utility/qctrlsignals/qctrlsignalhandler_win.h -#) -#else() -#add_files( -# LIB_GUI_FILES -# qt/utility/qctrlsignals/qctrlsignalhandler_unix.cpp -# qt/utility/qctrlsignals/qctrlsignalhandler_unix.h -#) -#endif() diff --git a/src/lib_gui/qt/QtCoreApplication.cpp b/src/lib_gui/qt/QtCoreApplication.cpp index ad13ba07..c922690b 100644 --- a/src/lib_gui/qt/QtCoreApplication.cpp +++ b/src/lib_gui/qt/QtCoreApplication.cpp @@ -28,10 +28,7 @@ void QtCoreApplication::handleMessage(MessageQuitApplication* message) void QtCoreApplication::handleMessage(MessageStatus* message) { -// if (m.substr(0,5) == "Index") - { - std::cout << message->status << std::endl; - } + std::cout << message->status << std::endl; } bool QtCoreApplication::saveLicense(License license) diff --git a/src/lib_gui/qt/window/QtStartScreen.cpp b/src/lib_gui/qt/window/QtStartScreen.cpp index 547506e7..0ffdc75d 100644 --- a/src/lib_gui/qt/window/QtStartScreen.cpp +++ b/src/lib_gui/qt/window/QtStartScreen.cpp @@ -145,7 +145,6 @@ void QtStartScreen::setupStartScreen() { License license; license.loadFromEncodedString(ApplicationSettings::getInstance()->getLicenseString(), AppPath::getAppPath()); -// license.loadPublicKeyFromString(PUBLIC_KEY); bool licenseValid = license.isValid(); setStyleSheet(utility::getStyleSheet(ResourcePaths::getGuiPath().concat(FilePath("startscreen/startscreen.css"))).c_str()); diff --git a/src/test/CommandlineTestSuite.h b/src/test/CommandlineTestSuite.h index 570c7a95..8c7fc9ce 100644 --- a/src/test/CommandlineTestSuite.h +++ b/src/test/CommandlineTestSuite.h @@ -9,7 +9,6 @@ class CommandlineTestSuite: public CxxTest::TestSuite { - ApplicationSettings backup_settings; public: diff --git a/src/test/GeneratorTestSuite.h b/src/test/GeneratorTestSuite.h index f5a70b7b..e83e153a 100644 --- a/src/test/GeneratorTestSuite.h +++ b/src/test/GeneratorTestSuite.h @@ -48,9 +48,6 @@ public: License license; license.loadFromString(generator.encodeLicense("TestUser", "VolumeLicense", 20)); -// license.create(generator.getPrivateKey(), "TestUser", "v2", "Volume License", 20); -// license.loadPublicKeyFromString(generator.getPublicKeyPEMFileAsString()); - TS_ASSERT_EQUALS(license.getSeats(), 20); } @@ -66,7 +63,6 @@ public: TS_ASSERT(license.isValid()); TS_ASSERT_EQUALS(license.getTimeLeft(), 10); -// TS_ASSERT_EQUALS(license.getVersion(), "v2"); license.loadPublicKeyFromString(generator.getPublicKeyPEMFileAsString()); license.loadFromString(generator.encodeLicense("User", -10)); @@ -84,16 +80,13 @@ public: License license; license.loadFromString(generator.encodeLicense("TestUser", "Private License", 1, "2017.4")); -// license.create(generator.getPrivateKey(), "TestUser", "v2"); std::string testInfo = "TestUser\nPrivate License\nValid up to version: 2017.4\n1 Seat"; TS_ASSERT_EQUALS(license.getLicenseInfo(), testInfo); -// license.create(generator.getPrivateKey(), "TestUser", "v2", "Volume License", 20); license.loadFromString(generator.encodeLicense("TestUser", "Volume License", 20, "2017.3")); testInfo = "TestUser\nVolume License\nValid up to version: 2017.3\n20 Seats"; TS_ASSERT_EQUALS(license.getLicenseInfo(), testInfo); -// license.create(generator.getPrivateKey(), "TestUser", "v2", "Private/Academic Single User License", 20); license.loadFromString(generator.encodeLicense("TestUser", "Private/Academic Single User License", 0, "2018.1")); testInfo = "TestUser\nPrivate/Academic Single User License\nValid up to version: 2018.1\nnot registered for commercial development"; TS_ASSERT_EQUALS(license.getLicenseInfo(), testInfo);