[gtksourceviewmm] Tests: Use Gtk::Application instead of Main.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceviewmm] Tests: Use Gtk::Application instead of Main.
- Date: Thu, 15 Mar 2012 12:02:45 +0000 (UTC)
commit e4ab2ed4b6ac47b7f968aa453af510f43ddc565f
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Mar 15 13:02:38 2012 +0100
Tests: Use Gtk::Application instead of Main.
ChangeLog | 10 ++++++++++
tests/basic/main.cc | 7 +++++--
tests/completion/main.cc | 7 +++++--
tests/get_buffer/main.cc | 6 +++++-
tests/langs/main.cc | 12 ++++++++----
tests/search/main.cc | 13 +++++++------
6 files changed, 40 insertions(+), 15 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ecffe4a..913a672 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-03-15 Murray Cumming <murrayc murrayc-desktop>
+
+ reviewed by: <delete if not using a buddy>
+
+ * tests/basic/main.cc:
+ * tests/completion/main.cc:
+ * tests/get_buffer/main.cc:
+ * tests/langs/main.cc:
+ * tests/search/main.cc:
+
2010-01-13 Krzesimir Nowak <qdlacz gmail com>
* ChangeLog: Auto-generated when releasing. If you are seeing this,
diff --git a/tests/basic/main.cc b/tests/basic/main.cc
index 62fad18..f87c1f2 100644
--- a/tests/basic/main.cc
+++ b/tests/basic/main.cc
@@ -9,7 +9,10 @@ using namespace Gsv;
int
main (int a_argc, char *a_argv[])
{
- Gtk::Main main_loop (a_argc, a_argv) ;
+ Glib::RefPtr<Gtk::Application> app =
+ Gtk::Application::create(a_argc, a_argv,
+ "org.gtksourceviewmm.test");
+
Gsv::init () ;
View source_view ;
@@ -25,7 +28,7 @@ main (int a_argc, char *a_argv[])
window.show_all () ;
- main_loop.run (window) ;
+ app->run (window) ;
return 0 ;
}
diff --git a/tests/completion/main.cc b/tests/completion/main.cc
index f458895..65665af 100644
--- a/tests/completion/main.cc
+++ b/tests/completion/main.cc
@@ -225,11 +225,14 @@ void TestWindow::show_icons_toggled()
int
main (int argc, char *argv[])
{
- Gtk::Main kit(argc, argv);
+ Glib::RefPtr<Gtk::Application> app =
+ Gtk::Application::create(argc, argv,
+ "org.gtksourceviewmm.test");
Gsv::init();
+
TestWindow window;
window.show_all();
- kit.run(window);
+ app->run(window);
return 0;
}
diff --git a/tests/get_buffer/main.cc b/tests/get_buffer/main.cc
index 1ad8707..1e230e9 100644
--- a/tests/get_buffer/main.cc
+++ b/tests/get_buffer/main.cc
@@ -5,7 +5,10 @@
int
main (int argc, char* argv[])
{
- Gtk::Main kit (argc, argv) ;
+ Glib::RefPtr<Gtk::Application> app =
+ Gtk::Application::create(argc, argv,
+ "org.gtksourceviewmm.test");
+
Gsv::init () ;
Gsv::View view ;
@@ -15,6 +18,7 @@ main (int argc, char* argv[])
} else {
std::cout << "FAILED" << std::endl;
}
+
return 0 ;
}
diff --git a/tests/langs/main.cc b/tests/langs/main.cc
index 450c59b..4573fc5 100644
--- a/tests/langs/main.cc
+++ b/tests/langs/main.cc
@@ -10,22 +10,26 @@ using namespace Gsv ;
int
main (int argc, char **argv)
{
- Gtk::Main loop (argc, argv) ;
- Gsv::init () ;
+ Glib::RefPtr<Gtk::Application> app =
+ Gtk::Application::create(argc, argv,
+ "org.gtksourceviewmm.test");
+
+ Gsv::init ();
Glib::RefPtr<LanguageManager> language_manager =
LanguageManager::create();
vector<string> langs = language_manager->get_language_ids ();
- cout << "number of languages found: " << langs.size () << std::endl;;
+ cout << "number of languages found: " << langs.size () << std::endl;
for (vector<string>::const_iterator iter = langs.begin(); iter != langs.end (); ++iter) {
if (!(iter->empty())) {
Glib::RefPtr<Language> lang = language_manager->get_language (*iter);
cout << "language: " << lang->get_name () << std::endl;
} else {
- cout << "language: null" << std::endl;;
+ cout << "language: null" << std::endl;
}
}
+
return 0 ;
}
diff --git a/tests/search/main.cc b/tests/search/main.cc
index 5e46f5a..5fe0ea6 100644
--- a/tests/search/main.cc
+++ b/tests/search/main.cc
@@ -362,19 +362,20 @@ public:
int
main (int argc, char **argv)
{
- //***************
- //init plumbing
- //***************
- Main kit (argc, argv) ;
+ Glib::RefPtr<Gtk::Application> gtkmmapp =
+ Gtk::Application::create(argc, argv,
+ "org.gtksourceviewmm.test");
+
Gsv::init () ;
- App app ;
+ App app ; //TODO: Derive from Gtk::Application?
app.get_widget ().set_size_request (500, 400) ;
app.get_widget ().show_all () ;
if (argc == 2) {
app.open_file (filename_to_utf8 (argv[1])) ;
}
- kit.run (app.get_widget ()) ;
+
+ gtkmmapp->run (app.get_widget ()) ;
return 0 ;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]