Session: Fix issue #67 by improving error handling

[pulseview.git] / pv / application.hpp

diff --git a/pv/application.hpp b/pv/application.hpp
index 78b2f9ec50571dc0b28e65793314c374f15d0d66..bfe4657009ae82407e139261914eb22ff461d2c9 100644 (file)
--- a/pv/application.hpp
+++ b/pv/application.hpp
@@ -28,6 +28,7 @@
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
+#include "devicemanager.hpp"
 #include "globalsettings.hpp"
 
 using std::shared_ptr;
@@ -41,11 +42,13 @@ class Application : public QApplication, public pv::GlobalSettingsInterface
 public:
        Application(int &argc, char* argv[]);
 
-       QStringList get_languages();
+       const QStringList get_languages() const;
+       const QString get_language_editors(const QString& language) const;
        void switch_language(const QString& language);
+
        void on_setting_changed(const QString &key, const QVariant &value);
 
-       void collect_version_info(shared_ptr<sigrok::Context> context);
+       void collect_version_info(pv::DeviceManager &device_manager);
        void print_version_info();
 
        vector< pair<QString, QString> > get_version_info() const;
@@ -67,7 +70,7 @@ private:
        vector< pair<QString, QString> > output_format_list_;
        vector< pair<QString, QString> > pd_list_;
 
-       QTranslator app_translator_, qt_translator_;
+       QTranslator app_translator_, qt_translator_, qtbase_translator_;
 };
 
 #endif // PULSEVIEW_PV_APPLICATION_HPP