From 341f51eb415c98c201b7744cea9ebc1fff321ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Janouch?= Date: Fri, 17 Sep 2010 19:03:03 +0200 Subject: [PATCH] Renamed source files. Also a little change in CMakeLists.txt. The next commit is going to change the object prefix. --- CMakeLists.txt | 27 ++++++++++--------- src/{canvas.c => ld-canvas.c} | 8 +++--- src/{canvas.h => ld-canvas.h} | 2 +- src/{document.c => ld-document.c} | 0 src/{document.h => ld-document.h} | 2 +- ...symbol-category.h => ld-symbol-category.h} | 2 +- src/{symbol-library.c => ld-symbol-library.c} | 14 +++++----- src/{symbol-library.h => ld-symbol-library.h} | 2 +- src/{symbol.h => ld-symbol.h} | 2 +- src/{window-main.c => ld-window-main.c} | 14 +++++----- src/{window-main.h => ld-window-main.h} | 2 +- src/{main.c => logdiag.c} | 4 +-- 12 files changed, 41 insertions(+), 38 deletions(-) rename src/{canvas.c => ld-canvas.c} (96%) rename src/{canvas.h => ld-canvas.h} (98%) rename src/{document.c => ld-document.c} (100%) rename src/{document.h => ld-document.h} (99%) rename src/{symbol-category.h => ld-symbol-category.h} (98%) rename src/{symbol-library.c => ld-symbol-library.c} (97%) rename src/{symbol-library.h => ld-symbol-library.h} (98%) rename src/{symbol.h => ld-symbol.h} (99%) rename src/{window-main.c => ld-window-main.c} (97%) rename src/{window-main.h => ld-window-main.h} (98%) rename src/{main.c => logdiag.c} (89%) diff --git a/CMakeLists.txt b/CMakeLists.txt index fc09eb2..d51af9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,10 @@ endif (OPTION_NOINSTALL) set (project_VERSION_MAJOR "0") set (project_VERSION_MINOR "0") set (project_VERSION_PATCH "1") -set (project_VERSION "0.0.1") + +set (project_VERSION "${project_VERSION_MAJOR}") +set (project_VERSION "${project_VERSION}.${project_VERSION_MINOR}") +set (project_VERSION "${project_VERSION}.${project_VERSION_PATCH}") # For custom modules set (CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) @@ -76,19 +79,19 @@ GTK_DOC_RUN (WORKING_DIR ${project_DOC_DIR} # Project source files set (logdiag_SOURCES - src/main.c - src/window-main.c - src/document.c - src/canvas.c - src/symbol-library.c) + src/logdiag.c + src/ld-window-main.c + src/ld-document.c + src/ld-canvas.c + src/ld-symbol-library.c) set (logdiag_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/config.h - src/window-main.h - src/document.h - src/canvas.h - src/symbol.h - src/symbol-category.h - src/symbol-library.h) + src/ld-window-main.h + src/ld-document.h + src/ld-canvas.h + src/ld-symbol.h + src/ld-symbol-category.h + src/ld-symbol-library.h) # Generate a configure file configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in diff --git a/src/canvas.c b/src/ld-canvas.c similarity index 96% rename from src/canvas.c rename to src/ld-canvas.c index 0168639..17e38a4 100644 --- a/src/canvas.c +++ b/src/ld-canvas.c @@ -1,5 +1,5 @@ /* - * canvas.c + * ld-canvas.c * * This file is a part of logdiag. * Copyright Přemysl Janouch 2010. All rights reserved. @@ -12,13 +12,13 @@ #include "config.h" -#include "canvas.h" -#include "document.h" +#include "ld-canvas.h" +#include "ld-document.h" /* http://www.gnomejournal.org/article/34/writing-a-widget-using-cairo-and-gtk28 */ /** - * SECTION:canvas + * SECTION:ld-canvas * @short_description: A canvas. * @see_also: #LogdiagDocument * diff --git a/src/canvas.h b/src/ld-canvas.h similarity index 98% rename from src/canvas.h rename to src/ld-canvas.h index be3539a..7dfd539 100644 --- a/src/canvas.h +++ b/src/ld-canvas.h @@ -1,5 +1,5 @@ /* - * canvas.h + * ld-canvas.h * * This file is a part of logdiag. * Copyright Přemysl Janouch 2010. All rights reserved. diff --git a/src/document.c b/src/ld-document.c similarity index 100% rename from src/document.c rename to src/ld-document.c diff --git a/src/document.h b/src/ld-document.h similarity index 99% rename from src/document.h rename to src/ld-document.h index 198d8f8..b40db52 100644 --- a/src/document.h +++ b/src/ld-document.h @@ -1,5 +1,5 @@ /* - * document.h + * ld-document.h * * This file is a part of logdiag. * Copyright Přemysl Janouch 2010. All rights reserved. diff --git a/src/symbol-category.h b/src/ld-symbol-category.h similarity index 98% rename from src/symbol-category.h rename to src/ld-symbol-category.h index 51ccb78..48c2701 100644 --- a/src/symbol-category.h +++ b/src/ld-symbol-category.h @@ -1,5 +1,5 @@ /* - * symbol-category.h + * ld-symbol-category.h * * This file is a part of logdiag. * Copyright Přemysl Janouch 2010. All rights reserved. diff --git a/src/symbol-library.c b/src/ld-symbol-library.c similarity index 97% rename from src/symbol-library.c rename to src/ld-symbol-library.c index 679a068..8876dd8 100644 --- a/src/symbol-library.c +++ b/src/ld-symbol-library.c @@ -1,5 +1,5 @@ /* - * symbol-library.c + * ld-symbol-library.c * * This file is a part of logdiag. * Copyright Přemysl Janouch 2010. All rights reserved. @@ -14,14 +14,14 @@ #include "config.h" -#include "symbol-library.h" -#include "symbol-category.h" -#include "symbol.h" +#include "ld-symbol-library.h" +#include "ld-symbol-category.h" +#include "ld-symbol.h" /* ===== Symbol library ==================================================== */ /** - * SECTION:symbol-library + * SECTION:ld-symbol-library * @short_description: A symbol library. * @see_also: #LogdiagSymbol, #LogdiagSymbolCategory * @@ -194,7 +194,7 @@ logdiag_symbol_library_clear (LogdiagSymbolLibrary *self) /* ===== Symbol category =================================================== */ /** - * SECTION:symbol-category + * SECTION:ld-symbol-category * @short_description: A category of symbols. * @see_also: #LogdiagSymbol, #LogdiagSymbolLibrary * @@ -268,7 +268,7 @@ logdiag_symbol_category_new (LogdiagSymbolLibrary *parent) /* ===== Symbol ============================================================ */ /** - * SECTION:symbol + * SECTION:ld-symbol * @short_description: A symbol. * @see_also: #LogdiagDocument, #LogdiagCanvas * diff --git a/src/symbol-library.h b/src/ld-symbol-library.h similarity index 98% rename from src/symbol-library.h rename to src/ld-symbol-library.h index 5091453..11350ba 100644 --- a/src/symbol-library.h +++ b/src/ld-symbol-library.h @@ -1,5 +1,5 @@ /* - * symbol-library.h + * ld-symbol-library.h * * This file is a part of logdiag. * Copyright Přemysl Janouch 2010. All rights reserved. diff --git a/src/symbol.h b/src/ld-symbol.h similarity index 99% rename from src/symbol.h rename to src/ld-symbol.h index 046786a..c1fd65c 100644 --- a/src/symbol.h +++ b/src/ld-symbol.h @@ -1,5 +1,5 @@ /* - * symbol.h + * ld-symbol.h * * This file is a part of logdiag. * Copyright Přemysl Janouch 2010. All rights reserved. diff --git a/src/window-main.c b/src/ld-window-main.c similarity index 97% rename from src/window-main.c rename to src/ld-window-main.c index 89714a5..db83869 100644 --- a/src/window-main.c +++ b/src/ld-window-main.c @@ -12,16 +12,16 @@ #include "config.h" -#include "window-main.h" -#include "canvas.h" -#include "document.h" -#include "symbol-library.h" -#include "symbol-category.h" -#include "symbol.h" +#include "ld-window-main.h" +#include "ld-canvas.h" +#include "ld-document.h" +#include "ld-symbol-library.h" +#include "ld-symbol-category.h" +#include "ld-symbol.h" /** - * SECTION:window-main + * SECTION:ld-window-main * @short_description: The main application window. * * #LogdiagWindowMain is the main window of the application. diff --git a/src/window-main.h b/src/ld-window-main.h similarity index 98% rename from src/window-main.h rename to src/ld-window-main.h index 28b3024..a637a1b 100644 --- a/src/window-main.h +++ b/src/ld-window-main.h @@ -1,5 +1,5 @@ /* - * window-main.h + * ld-window-main.h * * This file is a part of logdiag. * Copyright Přemysl Janouch 2010. All rights reserved. diff --git a/src/main.c b/src/logdiag.c similarity index 89% rename from src/main.c rename to src/logdiag.c index 5c9723f..4f69916 100644 --- a/src/main.c +++ b/src/logdiag.c @@ -1,5 +1,5 @@ /* - * main.c -- logdiag main source file. + * logdiag.c -- logdiag main source file. * * This file is a part of logdiag. * Copyright Přemysl Janouch 2010. All rights reserved. @@ -12,7 +12,7 @@ #include "config.h" -#include "window-main.h" +#include "ld-window-main.h" int main (int argc, char *argv[])