From 4ae7b32dc09eb7acd9411a8af63a767660aa64ec Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 17 Dec 2020 20:50:19 +0900 Subject: Renaming of files in preparation for code style tools. Signed-off-by: Michele Calgaro (cherry picked from commit 3e3d9eda9d1dd8c67c1c27c6a9bdc68bdecfcc30) --- .../cpp/app_templates/gnome2mmapp/Makefile.am | 10 ++--- .../cpp/app_templates/gnome2mmapp/gnome2mm.cc | 22 ---------- .../cpp/app_templates/gnome2mmapp/gnome2mm.cpp | 22 ++++++++++ .../gnome2mmapp/gnome2mmapp.kdevtemplate | 20 ++++----- .../cpp/app_templates/gnome2mmapp/main_window.cc | 16 ------- .../cpp/app_templates/gnome2mmapp/main_window.cpp | 14 +++++++ .../cpp/app_templates/gnome2mmapp/main_window.h | 17 ++++++++ .../cpp/app_templates/gnome2mmapp/main_window.hh | 19 --------- .../app_templates/gnome2mmapp/main_window_glade.cc | 30 ------------- .../gnome2mmapp/main_window_glade.cpp | 30 +++++++++++++ .../app_templates/gnome2mmapp/main_window_glade.h | 49 ++++++++++++++++++++++ .../app_templates/gnome2mmapp/main_window_glade.hh | 49 ---------------------- .../cpp/app_templates/gnome2mmapp/src-Makefile.am | 10 ++--- .../cpp/app_templates/gtk2mmapp/CMakeLists.txt | 8 ++-- languages/cpp/app_templates/gtk2mmapp/Makefile.am | 10 ++--- languages/cpp/app_templates/gtk2mmapp/gtk2mm.cc | 15 ------- languages/cpp/app_templates/gtk2mmapp/gtk2mm.cpp | 15 +++++++ .../app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate | 20 ++++----- .../cpp/app_templates/gtk2mmapp/main_window.cc | 12 ------ .../cpp/app_templates/gtk2mmapp/main_window.cpp | 10 +++++ .../cpp/app_templates/gtk2mmapp/main_window.h | 17 ++++++++ .../cpp/app_templates/gtk2mmapp/main_window.hh | 19 --------- .../app_templates/gtk2mmapp/main_window_glade.cc | 40 ------------------ .../app_templates/gtk2mmapp/main_window_glade.cpp | 40 ++++++++++++++++++ .../app_templates/gtk2mmapp/main_window_glade.h | 48 +++++++++++++++++++++ .../app_templates/gtk2mmapp/main_window_glade.hh | 48 --------------------- .../cpp/app_templates/gtk2mmapp/src-Makefile.am | 10 ++--- 27 files changed, 306 insertions(+), 314 deletions(-) delete mode 100644 languages/cpp/app_templates/gnome2mmapp/gnome2mm.cc create mode 100644 languages/cpp/app_templates/gnome2mmapp/gnome2mm.cpp delete mode 100644 languages/cpp/app_templates/gnome2mmapp/main_window.cc create mode 100644 languages/cpp/app_templates/gnome2mmapp/main_window.cpp create mode 100644 languages/cpp/app_templates/gnome2mmapp/main_window.h delete mode 100644 languages/cpp/app_templates/gnome2mmapp/main_window.hh delete mode 100644 languages/cpp/app_templates/gnome2mmapp/main_window_glade.cc create mode 100644 languages/cpp/app_templates/gnome2mmapp/main_window_glade.cpp create mode 100644 languages/cpp/app_templates/gnome2mmapp/main_window_glade.h delete mode 100644 languages/cpp/app_templates/gnome2mmapp/main_window_glade.hh delete mode 100644 languages/cpp/app_templates/gtk2mmapp/gtk2mm.cc create mode 100644 languages/cpp/app_templates/gtk2mmapp/gtk2mm.cpp delete mode 100644 languages/cpp/app_templates/gtk2mmapp/main_window.cc create mode 100644 languages/cpp/app_templates/gtk2mmapp/main_window.cpp create mode 100644 languages/cpp/app_templates/gtk2mmapp/main_window.h delete mode 100644 languages/cpp/app_templates/gtk2mmapp/main_window.hh delete mode 100644 languages/cpp/app_templates/gtk2mmapp/main_window_glade.cc create mode 100644 languages/cpp/app_templates/gtk2mmapp/main_window_glade.cpp create mode 100644 languages/cpp/app_templates/gtk2mmapp/main_window_glade.h delete mode 100644 languages/cpp/app_templates/gtk2mmapp/main_window_glade.hh (limited to 'languages/cpp') diff --git a/languages/cpp/app_templates/gnome2mmapp/Makefile.am b/languages/cpp/app_templates/gnome2mmapp/Makefile.am index f86ae76c..bca35481 100644 --- a/languages/cpp/app_templates/gnome2mmapp/Makefile.am +++ b/languages/cpp/app_templates/gnome2mmapp/Makefile.am @@ -1,7 +1,7 @@ -dataFiles = acconfig.h autogen.sh gnome2mm.glade main_window.cc \ - main_window_glade.hh Makefile.am app-Makefile.am \ - configure.in gnome2mm.gladep main_window.hh \ - app.kdevelop gnome2mm.cc gnome2mmapp main_window_glade.cc\ +dataFiles = acconfig.h autogen.sh gnome2mm.glade main_window.cpp \ + main_window_glade.h Makefile.am app-Makefile.am \ + configure.in gnome2mm.gladep main_window.h \ + app.kdevelop gnome2mm.cpp gnome2mmapp main_window_glade.cpp\ src-Makefile.am config.h gnome2mmapp.png templateName = gnome2mmapp @@ -18,4 +18,4 @@ $(templateName).tar.gz: ${dataFiles} archivedir = ${appwizarddatadir} archive_DATA = $(templateName).tar.gz ${templateName}.png -CLEANFILES = *.tar.gz \ No newline at end of file +CLEANFILES = *.tar.gz diff --git a/languages/cpp/app_templates/gnome2mmapp/gnome2mm.cc b/languages/cpp/app_templates/gnome2mmapp/gnome2mm.cc deleted file mode 100644 index 8a33b9ff..00000000 --- a/languages/cpp/app_templates/gnome2mmapp/gnome2mm.cc +++ /dev/null @@ -1,22 +0,0 @@ -%{CC_TEMPLATE} - -#include -#include -#include - -#include "main_window.hh" - -int main(int argc, char **argv) -{ -#if defined(ENABLE_NLS) - bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); - textdomain (GETTEXT_PACKAGE); -#endif //ENABLE_NLS - - Gnome::Main m(PACKAGE, VERSION, argc, argv); - - main_window *main_window = new class main_window(); - m.run(); - delete main_window; - return 0; -} diff --git a/languages/cpp/app_templates/gnome2mmapp/gnome2mm.cpp b/languages/cpp/app_templates/gnome2mmapp/gnome2mm.cpp new file mode 100644 index 00000000..be1ab196 --- /dev/null +++ b/languages/cpp/app_templates/gnome2mmapp/gnome2mm.cpp @@ -0,0 +1,22 @@ +%{CC_TEMPLATE} + +#include +#include +#include + +#include "main_window.h" + +int main(int argc, char **argv) +{ +#if defined(ENABLE_NLS) + bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); + textdomain (GETTEXT_PACKAGE); +#endif //ENABLE_NLS + + Gnome::Main m(PACKAGE, VERSION, argc, argv); + + main_window *main_window = new class main_window(); + m.run(); + delete main_window; + return 0; +} diff --git a/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate b/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate index 3b13385f..21dbd814 100644 --- a/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate +++ b/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate @@ -75,28 +75,28 @@ Dest=%{dest}/src/Makefile.am [FILE10] Type=install -Source=%{src}/gnome2mm.cc -Dest=%{dest}/src/%{APPNAMELC}.cc +Source=%{src}/gnome2mm.cpp +Dest=%{dest}/src/%{APPNAMELC}.cpp [FILE11] Type=install -Source=%{src}/main_window.hh -Dest=%{dest}/src/main_window.hh +Source=%{src}/main_window.h +Dest=%{dest}/src/main_window.h [FILE12] Type=install -Source=%{src}/main_window.cc -Dest=%{dest}/src/main_window.cc +Source=%{src}/main_window.cpp +Dest=%{dest}/src/main_window.cpp [FILE13] Type=install -Source=%{src}/main_window_glade.hh -Dest=%{dest}/src/main_window_glade.hh +Source=%{src}/main_window_glade.h +Dest=%{dest}/src/main_window_glade.h [FILE14] Type=install -Source=%{src}/main_window_glade.cc -Dest=%{dest}/src/main_window_glade.cc +Source=%{src}/main_window_glade.cpp +Dest=%{dest}/src/main_window_glade.cpp [MSG] Type=message diff --git a/languages/cpp/app_templates/gnome2mmapp/main_window.cc b/languages/cpp/app_templates/gnome2mmapp/main_window.cc deleted file mode 100644 index 4c73911b..00000000 --- a/languages/cpp/app_templates/gnome2mmapp/main_window.cc +++ /dev/null @@ -1,16 +0,0 @@ -%{CC_TEMPLATE} - -// newer (non customized) versions of this file go to main_window.cc_new - -// This file is for your program, I won't touch it again! - -#include "config.h" -#include "main_window.hh" - -#include - -gint main_window::quit(GdkEventAny *ev) -{ - Gtk::Main::quit(); -} - diff --git a/languages/cpp/app_templates/gnome2mmapp/main_window.cpp b/languages/cpp/app_templates/gnome2mmapp/main_window.cpp new file mode 100644 index 00000000..152a660c --- /dev/null +++ b/languages/cpp/app_templates/gnome2mmapp/main_window.cpp @@ -0,0 +1,14 @@ +%{CC_TEMPLATE} + +// This file is for your program, I won't touch it again! + +#include "config.h" +#include "main_window.h" + +#include + +gint main_window::quit(GdkEventAny *ev) +{ + Gtk::Main::quit(); +} + diff --git a/languages/cpp/app_templates/gnome2mmapp/main_window.h b/languages/cpp/app_templates/gnome2mmapp/main_window.h new file mode 100644 index 00000000..80ac8c70 --- /dev/null +++ b/languages/cpp/app_templates/gnome2mmapp/main_window.h @@ -0,0 +1,17 @@ +%{HH_TEMPLATE} + +// you might replace +// class foo : public foo_glade { ... }; +// by +// typedef foo_glade foo; +// if you didn't make any modifications to the widget + +#ifndef _MAIN_WINDOW_H +# include "main_window_glade.h" +# define _MAIN_WINDOW_H +class main_window : public main_window_glade +{ +protected: + virtual gint quit(GdkEventAny *ev); +}; +#endif diff --git a/languages/cpp/app_templates/gnome2mmapp/main_window.hh b/languages/cpp/app_templates/gnome2mmapp/main_window.hh deleted file mode 100644 index ae93336b..00000000 --- a/languages/cpp/app_templates/gnome2mmapp/main_window.hh +++ /dev/null @@ -1,19 +0,0 @@ -%{HH_TEMPLATE} - -// newer (non customized) versions of this file go to main_window.hh_new - -// you might replace -// class foo : public foo_glade { ... }; -// by -// typedef foo_glade foo; -// if you didn't make any modifications to the widget - -#ifndef _MAIN_WINDOW_HH -# include "main_window_glade.hh" -# define _MAIN_WINDOW_HH -class main_window : public main_window_glade -{ -protected: - virtual gint quit(GdkEventAny *ev); -}; -#endif diff --git a/languages/cpp/app_templates/gnome2mmapp/main_window_glade.cc b/languages/cpp/app_templates/gnome2mmapp/main_window_glade.cc deleted file mode 100644 index bea6c857..00000000 --- a/languages/cpp/app_templates/gnome2mmapp/main_window_glade.cc +++ /dev/null @@ -1,30 +0,0 @@ -%{CC_TEMPLATE} - -// DO NOT EDIT THIS FILE ! It was created using -// glade-- /home/amp8165/Projects/gnome2mm/gnome2mm.glade -// for gtk 2.2.4 and gtkmm 1.2.10 -// -// Please modify the corresponding derived classes in ./src/main_window.cc - -#include "config.h" -#include -#include "main_window_glade.hh" -#include -#include - -main_window_glade::main_window_glade( -) : Gtk::Window(GTK_WINDOW_TOPLEVEL) -{ main_window = this; - - Gtk::AccelGroup *main_window_accgrp = Gtk::AccelGroup::create(); - gmm_data = new GlademmData(main_window_accgrp); - main_window->set_title(_("%{APPNAME} Project")); - main_window->set_modal(false); - main_window->add_accel_group(*(gmm_data->getAccelGroup())); - main_window->show(); - main_window->delete_event.connect(SigC::slot(this, &main_window_glade::quit)); -} - -main_window_glade::~main_window_glade() -{ delete gmm_data; -} diff --git a/languages/cpp/app_templates/gnome2mmapp/main_window_glade.cpp b/languages/cpp/app_templates/gnome2mmapp/main_window_glade.cpp new file mode 100644 index 00000000..577d3576 --- /dev/null +++ b/languages/cpp/app_templates/gnome2mmapp/main_window_glade.cpp @@ -0,0 +1,30 @@ +%{CC_TEMPLATE} + +// DO NOT EDIT THIS FILE ! It was created using +// glade-- /home/amp8165/Projects/gnome2mm/gnome2mm.glade +// for gtk 2.2.4 and gtkmm 1.2.10 +// +// Please modify the corresponding derived classes in ./src/main_window.cpp + +#include "config.h" +#include +#include "main_window_glade.h" +#include +#include + +main_window_glade::main_window_glade( +) : Gtk::Window(GTK_WINDOW_TOPLEVEL) +{ main_window = this; + + Gtk::AccelGroup *main_window_accgrp = Gtk::AccelGroup::create(); + gmm_data = new GlademmData(main_window_accgrp); + main_window->set_title(_("%{APPNAME} Project")); + main_window->set_modal(false); + main_window->add_accel_group(*(gmm_data->getAccelGroup())); + main_window->show(); + main_window->delete_event.connect(SigC::slot(this, &main_window_glade::quit)); +} + +main_window_glade::~main_window_glade() +{ delete gmm_data; +} diff --git a/languages/cpp/app_templates/gnome2mmapp/main_window_glade.h b/languages/cpp/app_templates/gnome2mmapp/main_window_glade.h new file mode 100644 index 00000000..1793dbdc --- /dev/null +++ b/languages/cpp/app_templates/gnome2mmapp/main_window_glade.h @@ -0,0 +1,49 @@ +%{HH_TEMPLATE} + +// DO NOT EDIT THIS FILE ! It was created using +// glade-- /home/amp8165/Projects/gnome2mm/gnome2mm.glade +// for gtk 2.2.4 and gtkmm 1.2.10 +// +// Please modify the corresponding derived classes in ./src/main_window.h and./src/main_window.cpp + +#ifndef _MAIN_WINDOW_GLADE_H +# define _MAIN_WINDOW_GLADE_H + + +#if !defined(GLADEMM_DATA) +#define GLADEMM_DATA +#include + +class GlademmData +{ + + Gtk::AccelGroup *accgrp; +public: + + GlademmData(Gtk::AccelGroup *ag) : accgrp(ag) + { + } + + Gtk::AccelGroup * getAccelGroup() + { return accgrp; + } +}; +#endif //GLADEMM_DATA + +#include + +class main_window_glade : public Gtk::Window +{ + + GlademmData *gmm_data; +public: + class Gtk::Window *main_window; +protected: + + main_window_glade(); + + ~main_window_glade(); + + virtual gint quit(GdkEventAny *ev) = 0; +}; +#endif diff --git a/languages/cpp/app_templates/gnome2mmapp/main_window_glade.hh b/languages/cpp/app_templates/gnome2mmapp/main_window_glade.hh deleted file mode 100644 index 97a9302f..00000000 --- a/languages/cpp/app_templates/gnome2mmapp/main_window_glade.hh +++ /dev/null @@ -1,49 +0,0 @@ -%{HH_TEMPLATE} - -// DO NOT EDIT THIS FILE ! It was created using -// glade-- /home/amp8165/Projects/gnome2mm/gnome2mm.glade -// for gtk 2.2.4 and gtkmm 1.2.10 -// -// Please modify the corresponding derived classes in ./src/main_window.hh and./src/main_window.cc - -#ifndef _MAIN_WINDOW_GLADE_HH -# define _MAIN_WINDOW_GLADE_HH - - -#if !defined(GLADEMM_DATA) -#define GLADEMM_DATA -#include - -class GlademmData -{ - - Gtk::AccelGroup *accgrp; -public: - - GlademmData(Gtk::AccelGroup *ag) : accgrp(ag) - { - } - - Gtk::AccelGroup * getAccelGroup() - { return accgrp; - } -}; -#endif //GLADEMM_DATA - -#include - -class main_window_glade : public Gtk::Window -{ - - GlademmData *gmm_data; -public: - class Gtk::Window *main_window; -protected: - - main_window_glade(); - - ~main_window_glade(); - - virtual gint quit(GdkEventAny *ev) = 0; -}; -#endif diff --git a/languages/cpp/app_templates/gnome2mmapp/src-Makefile.am b/languages/cpp/app_templates/gnome2mmapp/src-Makefile.am index fe5ec32c..81df1152 100644 --- a/languages/cpp/app_templates/gnome2mmapp/src-Makefile.am +++ b/languages/cpp/app_templates/gnome2mmapp/src-Makefile.am @@ -1,13 +1,13 @@ bin_PROGRAMS = %{APPNAMELC} %{APPNAMELC}_SOURCES = \ - %{APPNAMELC}.cc\ - main_window_glade.cc \ - main_window.cc + %{APPNAMELC}.cpp\ + main_window_glade.cpp \ + main_window.cpp noinst_HEADERS = \ - main_window_glade.hh \ - main_window.hh + main_window_glade.h \ + main_window.h AM_CXXFLAGS = @CXXFLAGS@ @GNOMEMM_CFLAGS@ diff --git a/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt b/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt index 0a78898d..f152b532 100644 --- a/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt +++ b/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt @@ -10,10 +10,10 @@ ################################################# set( _tarball_content - acconfig.h autogen.sh gtk2mm.glade main_window.cc - main_window_glade.hh Makefile.am app-Makefile.am - configure.in gtk2mm.gladep main_window.hh app.kdevelop - gtk2mm.cc main_window_glade.cc src-Makefile.am config.h + acconfig.h autogen.sh gtk2mm.glade main_window.cpp + main_window_glade.h Makefile.am app-Makefile.am + configure.in gtk2mm.gladep main_window.h app.kdevelop + gtk2mm.cpp main_window_glade.cpp src-Makefile.am config.h gtk2mmapp.png ) list( SORT _tarball_content ) diff --git a/languages/cpp/app_templates/gtk2mmapp/Makefile.am b/languages/cpp/app_templates/gtk2mmapp/Makefile.am index 2069ade7..16978c39 100644 --- a/languages/cpp/app_templates/gtk2mmapp/Makefile.am +++ b/languages/cpp/app_templates/gtk2mmapp/Makefile.am @@ -1,7 +1,7 @@ -dataFiles = acconfig.h autogen.sh gtk2mm.glade main_window.cc \ - main_window_glade.hh Makefile.am app-Makefile.am \ - configure.in gtk2mm.gladep main_window.hh \ - app.kdevelop gtk2mm.cc main_window_glade.cc\ +dataFiles = acconfig.h autogen.sh gtk2mm.glade main_window.cpp \ + main_window_glade.h Makefile.am app-Makefile.am \ + configure.in gtk2mm.gladep main_window.h \ + app.kdevelop gtk2mm.cpp main_window_glade.cpp\ src-Makefile.am config.h gtk2mmapp.png templateName = gtk2mmapp @@ -18,4 +18,4 @@ $(templateName).tar.gz: ${dataFiles} archivedir = ${appwizarddatadir} archive_DATA = $(templateName).tar.gz ${templateName}.png -CLEANFILES = *.tar.gz \ No newline at end of file +CLEANFILES = *.tar.gz diff --git a/languages/cpp/app_templates/gtk2mmapp/gtk2mm.cc b/languages/cpp/app_templates/gtk2mmapp/gtk2mm.cc deleted file mode 100644 index 9845fede..00000000 --- a/languages/cpp/app_templates/gtk2mmapp/gtk2mm.cc +++ /dev/null @@ -1,15 +0,0 @@ -%{CC_TEMPLATE} - -#include - -#include "main_window.hh" - -int main(int argc, char **argv) -{ - - Gtk::Main m(&argc, &argv); - - main_window main_window; - Gtk::Main::run(main_window); - return 0; -} diff --git a/languages/cpp/app_templates/gtk2mmapp/gtk2mm.cpp b/languages/cpp/app_templates/gtk2mmapp/gtk2mm.cpp new file mode 100644 index 00000000..30f39adf --- /dev/null +++ b/languages/cpp/app_templates/gtk2mmapp/gtk2mm.cpp @@ -0,0 +1,15 @@ +%{CC_TEMPLATE} + +#include + +#include "main_window.h" + +int main(int argc, char **argv) +{ + + Gtk::Main m(&argc, &argv); + + main_window main_window; + Gtk::Main::run(main_window); + return 0; +} diff --git a/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate b/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate index 35b51993..68b119a2 100644 --- a/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate +++ b/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate @@ -71,28 +71,28 @@ Dest=%{dest}/src/Makefile.am [FILE10] Type=install -Source=%{src}/gtk2mm.cc -Dest=%{dest}/src/%{APPNAMELC}.cc +Source=%{src}/gtk2mm.cpp +Dest=%{dest}/src/%{APPNAMELC}.cpp [FILE11] Type=install -Source=%{src}/main_window.hh -Dest=%{dest}/src/main_window.hh +Source=%{src}/main_window.h +Dest=%{dest}/src/main_window.h [FILE12] Type=install -Source=%{src}/main_window.cc -Dest=%{dest}/src/main_window.cc +Source=%{src}/main_window.cpp +Dest=%{dest}/src/main_window.cpp [FILE13] Type=install -Source=%{src}/main_window_glade.hh -Dest=%{dest}/src/main_window_glade.hh +Source=%{src}/main_window_glade.h +Dest=%{dest}/src/main_window_glade.h [FILE14] Type=install -Source=%{src}/main_window_glade.cc -Dest=%{dest}/src/main_window_glade.cc +Source=%{src}/main_window_glade.cpp +Dest=%{dest}/src/main_window_glade.cpp [MSG] Type=message diff --git a/languages/cpp/app_templates/gtk2mmapp/main_window.cc b/languages/cpp/app_templates/gtk2mmapp/main_window.cc deleted file mode 100644 index ad36b327..00000000 --- a/languages/cpp/app_templates/gtk2mmapp/main_window.cc +++ /dev/null @@ -1,12 +0,0 @@ -%{CC_TEMPLATE} - -// newer (non customized) versions of this file go to main_window.cc_new - -// This file is for your program, I won't touch it again! - -#include "config.h" -#include "main_window.hh" - -bool main_window::quit(GdkEventAny *ev) -{ return 0; -} diff --git a/languages/cpp/app_templates/gtk2mmapp/main_window.cpp b/languages/cpp/app_templates/gtk2mmapp/main_window.cpp new file mode 100644 index 00000000..3a7df9cf --- /dev/null +++ b/languages/cpp/app_templates/gtk2mmapp/main_window.cpp @@ -0,0 +1,10 @@ +%{CC_TEMPLATE} + +// This file is for your program, I won't touch it again! + +#include "config.h" +#include "main_window.h" + +bool main_window::quit(GdkEventAny *ev) +{ return 0; +} diff --git a/languages/cpp/app_templates/gtk2mmapp/main_window.h b/languages/cpp/app_templates/gtk2mmapp/main_window.h new file mode 100644 index 00000000..85daad4b --- /dev/null +++ b/languages/cpp/app_templates/gtk2mmapp/main_window.h @@ -0,0 +1,17 @@ +%{HH_TEMPLATE} + +// you might replace +// class foo : public foo_glade { ... }; +// by +// typedef foo_glade foo; +// if you didn't make any modifications to the widget + +#ifndef _MAIN_WINDOW_H +# include "main_window_glade.h" +# define _MAIN_WINDOW_H +class main_window : public main_window_glade +{ + + bool quit(GdkEventAny *ev); +}; +#endif diff --git a/languages/cpp/app_templates/gtk2mmapp/main_window.hh b/languages/cpp/app_templates/gtk2mmapp/main_window.hh deleted file mode 100644 index 640e1461..00000000 --- a/languages/cpp/app_templates/gtk2mmapp/main_window.hh +++ /dev/null @@ -1,19 +0,0 @@ -%{HH_TEMPLATE} - -// newer (non customized) versions of this file go to main_window.hh_new - -// you might replace -// class foo : public foo_glade { ... }; -// by -// typedef foo_glade foo; -// if you didn't make any modifications to the widget - -#ifndef _MAIN_WINDOW_HH -# include "main_window_glade.hh" -# define _MAIN_WINDOW_HH -class main_window : public main_window_glade -{ - - bool quit(GdkEventAny *ev); -}; -#endif diff --git a/languages/cpp/app_templates/gtk2mmapp/main_window_glade.cc b/languages/cpp/app_templates/gtk2mmapp/main_window_glade.cc deleted file mode 100644 index 829855a8..00000000 --- a/languages/cpp/app_templates/gtk2mmapp/main_window_glade.cc +++ /dev/null @@ -1,40 +0,0 @@ -%{CC_TEMPLATE} - -// DO NOT EDIT THIS FILE ! It was created using glade-- -// for gtk 2.8.3 and gtkmm 2.8.0 -// -// Please modify the corresponding derived classes in ./src/main_window.cc - - -#if defined __GNUC__ && __GNUC__ < 3 -#error This program will crash if compiled with g++ 2.x -// see the dynamic_cast bug in the gtkmm FAQ -#endif // -#include "config.h" -#include -#if GTKMM_MAJOR_VERSION==2 && GTKMM_MINOR_VERSION>2 -#include -#define GMM_GTKMM_22_24(a,b) b -#else //gtkmm 2.2 -#define GMM_GTKMM_22_24(a,b) a -#endif // -#include "main_window_glade.hh" -#include -#include - -main_window_glade::main_window_glade( -) : Gtk::Window(Gtk::WINDOW_TOPLEVEL) -{ main_window = this; - gmm_data = new GlademmData(get_accel_group()); - main_window->set_title("%{APPNAME} Project"); - main_window->set_modal(false); - main_window->property_window_position().set_value(Gtk::WIN_POS_CENTER); - main_window->set_resizable(true); - main_window->property_destroy_with_parent().set_value(false); - main_window->show(); - main_window->signal_delete_event().connect(SigC::slot(*this, &main_window_glade::quit), false); -} - -main_window_glade::~main_window_glade() -{ delete gmm_data; -} diff --git a/languages/cpp/app_templates/gtk2mmapp/main_window_glade.cpp b/languages/cpp/app_templates/gtk2mmapp/main_window_glade.cpp new file mode 100644 index 00000000..5bed4679 --- /dev/null +++ b/languages/cpp/app_templates/gtk2mmapp/main_window_glade.cpp @@ -0,0 +1,40 @@ +%{CC_TEMPLATE} + +// DO NOT EDIT THIS FILE ! It was created using glade-- +// for gtk 2.8.3 and gtkmm 2.8.0 +// +// Please modify the corresponding derived classes in ./src/main_window.cpp + + +#if defined __GNUC__ && __GNUC__ < 3 +#error This program will crash if compiled with g++ 2.x +// see the dynamic_cast bug in the gtkmm FAQ +#endif // +#include "config.h" +#include +#if GTKMM_MAJOR_VERSION==2 && GTKMM_MINOR_VERSION>2 +#include +#define GMM_GTKMM_22_24(a,b) b +#else //gtkmm 2.2 +#define GMM_GTKMM_22_24(a,b) a +#endif // +#include "main_window_glade.h" +#include +#include + +main_window_glade::main_window_glade( +) : Gtk::Window(Gtk::WINDOW_TOPLEVEL) +{ main_window = this; + gmm_data = new GlademmData(get_accel_group()); + main_window->set_title("%{APPNAME} Project"); + main_window->set_modal(false); + main_window->property_window_position().set_value(Gtk::WIN_POS_CENTER); + main_window->set_resizable(true); + main_window->property_destroy_with_parent().set_value(false); + main_window->show(); + main_window->signal_delete_event().connect(SigC::slot(*this, &main_window_glade::quit), false); +} + +main_window_glade::~main_window_glade() +{ delete gmm_data; +} diff --git a/languages/cpp/app_templates/gtk2mmapp/main_window_glade.h b/languages/cpp/app_templates/gtk2mmapp/main_window_glade.h new file mode 100644 index 00000000..726409b4 --- /dev/null +++ b/languages/cpp/app_templates/gtk2mmapp/main_window_glade.h @@ -0,0 +1,48 @@ +%{HH_TEMPLATE} + +// DO NOT EDIT THIS FILE ! It was created using glade-- +// for gtk 2.8.3 and gtkmm 2.8.0 +// +// Please modify the corresponding derived classes in ./src/main_window.h and./src/main_window.cpp + +#ifndef _MAIN_WINDOW_GLADE_H +# define _MAIN_WINDOW_GLADE_H + + +#if !defined(GLADEMM_DATA) +#define GLADEMM_DATA +#include + +class GlademmData +{ + + Glib::RefPtr accgrp; +public: + + GlademmData(Glib::RefPtr ag) : accgrp(ag) + { + } + + Glib::RefPtr getAccelGroup() + { return accgrp; + } +}; +#endif //GLADEMM_DATA + +#include + +class main_window_glade : public Gtk::Window +{ + + GlademmData *gmm_data; +public: + class Gtk::Window * main_window; +protected: + + main_window_glade(); + + ~main_window_glade(); +private: + virtual bool quit(GdkEventAny *ev) = 0; +}; +#endif diff --git a/languages/cpp/app_templates/gtk2mmapp/main_window_glade.hh b/languages/cpp/app_templates/gtk2mmapp/main_window_glade.hh deleted file mode 100644 index 3c0cc27a..00000000 --- a/languages/cpp/app_templates/gtk2mmapp/main_window_glade.hh +++ /dev/null @@ -1,48 +0,0 @@ -%{HH_TEMPLATE} - -// DO NOT EDIT THIS FILE ! It was created using glade-- -// for gtk 2.8.3 and gtkmm 2.8.0 -// -// Please modify the corresponding derived classes in ./src/main_window.hh and./src/main_window.cc - -#ifndef _MAIN_WINDOW_GLADE_HH -# define _MAIN_WINDOW_GLADE_HH - - -#if !defined(GLADEMM_DATA) -#define GLADEMM_DATA -#include - -class GlademmData -{ - - Glib::RefPtr accgrp; -public: - - GlademmData(Glib::RefPtr ag) : accgrp(ag) - { - } - - Glib::RefPtr getAccelGroup() - { return accgrp; - } -}; -#endif //GLADEMM_DATA - -#include - -class main_window_glade : public Gtk::Window -{ - - GlademmData *gmm_data; -public: - class Gtk::Window * main_window; -protected: - - main_window_glade(); - - ~main_window_glade(); -private: - virtual bool quit(GdkEventAny *ev) = 0; -}; -#endif diff --git a/languages/cpp/app_templates/gtk2mmapp/src-Makefile.am b/languages/cpp/app_templates/gtk2mmapp/src-Makefile.am index a8c856e9..e61b92f5 100644 --- a/languages/cpp/app_templates/gtk2mmapp/src-Makefile.am +++ b/languages/cpp/app_templates/gtk2mmapp/src-Makefile.am @@ -1,13 +1,13 @@ bin_PROGRAMS = %{APPNAMELC} %{APPNAMELC}_SOURCES = \ - %{APPNAMELC}.cc\ - main_window_glade.cc \ - main_window.cc + %{APPNAMELC}.cpp\ + main_window_glade.cpp \ + main_window.cpp noinst_HEADERS = \ - main_window_glade.hh \ - main_window.hh + main_window_glade.h \ + main_window.h AM_CXXFLAGS = @CXXFLAGS@ @GTKMM_CFLAGS@ -- cgit v1.2.3