From fce86b22a2367f1be1f9aae5e1ba3d18d1371b74 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 8 Dec 2020 22:26:17 +0900 Subject: Renaming of files in preparation for code style tools. Signed-off-by: Michele Calgaro --- arts/gui/common/CMakeLists.txt | 6 ++-- arts/gui/common/Makefile.am | 8 ++--- arts/gui/common/artsgui.idl | 2 +- arts/gui/common/genericguifactory_impl.cc | 56 ------------------------------ arts/gui/common/genericguifactory_impl.cpp | 56 ++++++++++++++++++++++++++++++ 5 files changed, 64 insertions(+), 64 deletions(-) delete mode 100644 arts/gui/common/genericguifactory_impl.cc create mode 100644 arts/gui/common/genericguifactory_impl.cpp (limited to 'arts/gui') diff --git a/arts/gui/common/CMakeLists.txt b/arts/gui/common/CMakeLists.txt index 6fa63e44..030e3c65 100644 --- a/arts/gui/common/CMakeLists.txt +++ b/arts/gui/common/CMakeLists.txt @@ -27,14 +27,14 @@ link_directories( ##### artsgui (library) ######################### tde_add_library( artsgui_idl SHARED - SOURCES artsgui.cc + SOURCES artsgui.cpp VERSION 0.0.0 LINK mcop ${DL_LIBRARIES} ${ARTS_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) tde_add_library( artsgui SHARED - SOURCES genericguifactory_impl.cc + SOURCES genericguifactory_impl.cpp VERSION 0.0.0 LINK artsgui_idl-shared DESTINATION ${LIB_INSTALL_DIR} @@ -42,7 +42,7 @@ tde_add_library( artsgui SHARED add_custom_command( OUTPUT - artsgui.cc artsgui.h + artsgui.cpp artsgui.h artsgui.mcoptype artsgui.mcopclass COMMAND ${ARTS_MCOPIDL_EXECUTABLE} -t -I${ARTS_INCLUDEDIR} ${CMAKE_CURRENT_SOURCE_DIR}/artsgui.idl diff --git a/arts/gui/common/Makefile.am b/arts/gui/common/Makefile.am index 9d82449f..3368a235 100644 --- a/arts/gui/common/Makefile.am +++ b/arts/gui/common/Makefile.am @@ -2,23 +2,23 @@ lib_LTLIBRARIES = libartsgui_idl.la libartsgui.la INCLUDES= -I$(arts_includes) -I$(top_builddir)/arts/runtime $(all_includes) -libartsgui_idl_la_SOURCES = artsgui.cc +libartsgui_idl_la_SOURCES = artsgui.cpp libartsgui_idl_la_LIBADD = -lmcop $(LIBDL) libartsgui_idl_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \ -no-undefined -libartsgui_la_SOURCES = genericguifactory_impl.cc +libartsgui_la_SOURCES = genericguifactory_impl.cpp libartsgui_la_LIBADD = libartsgui_idl.la libartsgui_la_LDFLAGS = $(all_libraries) -no-undefined libartsgui_la_COMPILE_FIRST = artsgui.h -artsgui.cc artsgui.h: $(srcdir)/artsgui.idl $(MCOPIDL) +artsgui.cpp artsgui.h: $(srcdir)/artsgui.idl $(MCOPIDL) $(MCOPIDL) -t -I$(includedir)/arts $(srcdir)/artsgui.idl artsgui.mcoptype: artsgui.h artsgui.mcopclass: artsgui.h -DISTCLEANFILES = artsgui.cc artsgui.h \ +DISTCLEANFILES = artsgui.cpp artsgui.h \ artsgui.mcoptype artsgui.mcopclass ####### install idl files diff --git a/arts/gui/common/artsgui.idl b/arts/gui/common/artsgui.idl index c7d0554e..76b6a8c5 100644 --- a/arts/gui/common/artsgui.idl +++ b/arts/gui/common/artsgui.idl @@ -23,7 +23,7 @@ */ /* - * DISCLAIMER: The interfaces in artsgui.idl (and the derived .cc/.h files) + * DISCLAIMER: The interfaces in artsgui.idl (and the derived .cpp/.h files) * DO NOT GUARANTEE BINARY COMPATIBILITY YET. * * They are intended for developers. You shouldn't expect that applications in diff --git a/arts/gui/common/genericguifactory_impl.cc b/arts/gui/common/genericguifactory_impl.cc deleted file mode 100644 index 163d7e21..00000000 --- a/arts/gui/common/genericguifactory_impl.cc +++ /dev/null @@ -1,56 +0,0 @@ - /* - - Copyright (C) 2001 Stefan Westerfeld - stefan@space.twc.de - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. - - */ - -#include "artsgui.h" -#include "debug.h" - -using namespace Arts; -using namespace std; - -namespace Arts { - -class GenericGuiFactory_impl : public GenericGuiFactory_skel { -public: - Widget createGui(Object runningObject); -}; -REGISTER_IMPLEMENTATION(GenericGuiFactory_impl); - -} - -Widget GenericGuiFactory_impl::createGui(Object runningObject) -{ - Arts::Widget result = Arts::Widget::null(); - arts_return_val_if_fail(!runningObject.isNull(), result); - - TraderQuery query; - query.supports("Interface","Arts::GuiFactory"); - query.supports("CanCreate",runningObject._interfaceName()); - - vector *queryResults = query.query(); - if(queryResults->size()) - { - Arts::GuiFactory factory = SubClass((*queryResults)[0].interfaceName()); - result = factory.createGui(runningObject); - } - delete queryResults; - return result; -} diff --git a/arts/gui/common/genericguifactory_impl.cpp b/arts/gui/common/genericguifactory_impl.cpp new file mode 100644 index 00000000..163d7e21 --- /dev/null +++ b/arts/gui/common/genericguifactory_impl.cpp @@ -0,0 +1,56 @@ + /* + + Copyright (C) 2001 Stefan Westerfeld + stefan@space.twc.de + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + + */ + +#include "artsgui.h" +#include "debug.h" + +using namespace Arts; +using namespace std; + +namespace Arts { + +class GenericGuiFactory_impl : public GenericGuiFactory_skel { +public: + Widget createGui(Object runningObject); +}; +REGISTER_IMPLEMENTATION(GenericGuiFactory_impl); + +} + +Widget GenericGuiFactory_impl::createGui(Object runningObject) +{ + Arts::Widget result = Arts::Widget::null(); + arts_return_val_if_fail(!runningObject.isNull(), result); + + TraderQuery query; + query.supports("Interface","Arts::GuiFactory"); + query.supports("CanCreate",runningObject._interfaceName()); + + vector *queryResults = query.query(); + if(queryResults->size()) + { + Arts::GuiFactory factory = SubClass((*queryResults)[0].interfaceName()); + result = factory.createGui(runningObject); + } + delete queryResults; + return result; +} -- cgit v1.2.1