From f3e484082d35e9d273667a9a2102a62e46d0d0cb Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Fri, 20 Apr 2007 11:26:05 +0000 Subject: [PATCH] Link -> Action renaming. Step #1: link.(cpp|h) -> action.(cpp|h) svn path=/trunk/KDE/kdegraphics/okular/; revision=656123 --- CMakeLists.txt | 4 ++-- core/{link.cpp => action.cpp} | 2 +- core/{link.h => action.h} | 0 core/area.cpp | 2 +- core/audioplayer.cpp | 2 +- core/document.cpp | 2 +- core/page.cpp | 2 +- core/textdocumentgenerator.cpp | 2 +- generators/chm/generator_chm.cpp | 2 +- generators/djvu/generator_djvu.cpp | 2 +- generators/dvi/generator_dvi.cpp | 2 +- generators/fictionbook/converter.cpp | 2 +- generators/ooo/converter.cpp | 2 +- generators/plucker/unpluck/qunpluck.cpp | 2 +- generators/poppler/generator_pdf.cpp | 2 +- ui/pageview.cpp | 2 +- ui/presentationwidget.cpp | 2 +- ui/toc.cpp | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) rename core/{link.cpp => action.cpp} (99%) rename core/{link.h => action.h} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a95584ca..6b987cc1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,7 @@ include_directories( # okularcore set(okularcore_SRCS + core/action.cpp core/annotations.cpp core/area.cpp core/audioplayer.cpp @@ -28,7 +29,6 @@ set(okularcore_SRCS core/document.cpp core/form.cpp core/generator.cpp - core/link.cpp core/misc.cpp core/observer.cpp core/page.cpp @@ -44,12 +44,12 @@ set(okularcore_SRCS ) install( FILES + core/action.h core/annotations.h core/area.h core/document.h core/form.h core/generator.h - core/link.h core/observer.h core/okular_export.h core/page.h diff --git a/core/link.cpp b/core/action.cpp similarity index 99% rename from core/link.cpp rename to core/action.cpp index e3060044a..3c29d1191 100644 --- a/core/link.cpp +++ b/core/action.cpp @@ -7,7 +7,7 @@ * (at your option) any later version. * ***************************************************************************/ -#include "link.h" +#include "action.h" // kde includes #include diff --git a/core/link.h b/core/action.h similarity index 100% rename from core/link.h rename to core/action.h diff --git a/core/area.cpp b/core/area.cpp index 39a6ad043..7137b9ed1 100644 --- a/core/area.cpp +++ b/core/area.cpp @@ -14,8 +14,8 @@ #include +#include "action.h" #include "annotations.h" -#include "link.h" #include "sourcereference.h" using namespace Okular; diff --git a/core/audioplayer.cpp b/core/audioplayer.cpp index def41339a..e65b8bc25 100644 --- a/core/audioplayer.cpp +++ b/core/audioplayer.cpp @@ -21,7 +21,7 @@ #include // local includes -#include "link.h" +#include "action.h" #include "sound.h" using namespace Okular; diff --git a/core/document.cpp b/core/document.cpp index 33dda87f6..ccc1b746f 100644 --- a/core/document.cpp +++ b/core/document.cpp @@ -37,6 +37,7 @@ #include // local includes +#include "action.h" #include "audioplayer.h" #include "bookmarkmanager.h" #include "chooseenginedialog.h" @@ -44,7 +45,6 @@ #include "interfaces/configinterface.h" #include "interfaces/guiinterface.h" #include "interfaces/printinterface.h" -#include "link.h" #include "observer.h" #include "page.h" #include "page_p.h" diff --git a/core/page.cpp b/core/page.cpp index 2c6fb7f51..8a3813e5b 100644 --- a/core/page.cpp +++ b/core/page.cpp @@ -19,10 +19,10 @@ #include // local includes +#include "action.h" #include "annotations.h" #include "area.h" #include "form.h" -#include "link.h" #include "pagecontroller_p.h" #include "pagesize.h" #include "pagetransition.h" diff --git a/core/textdocumentgenerator.cpp b/core/textdocumentgenerator.cpp index 0607b0252..b0525fc6d 100644 --- a/core/textdocumentgenerator.cpp +++ b/core/textdocumentgenerator.cpp @@ -19,8 +19,8 @@ #include #include +#include #include -#include #include #include diff --git a/generators/chm/generator_chm.cpp b/generators/chm/generator_chm.cpp index 8b5dfb828..70fbb7cb9 100644 --- a/generators/chm/generator_chm.cpp +++ b/generators/chm/generator_chm.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include //for PAGEVIEW_ID #include #include diff --git a/generators/djvu/generator_djvu.cpp b/generators/djvu/generator_djvu.cpp index 1b6d5dac6..402c434a1 100644 --- a/generators/djvu/generator_djvu.cpp +++ b/generators/djvu/generator_djvu.cpp @@ -9,10 +9,10 @@ #include "generator_djvu.h" #include "kdjvu.h" +#include #include #include #include -#include #include #include diff --git a/generators/dvi/generator_dvi.cpp b/generators/dvi/generator_dvi.cpp index 4f4668352..4cdcfcfc7 100644 --- a/generators/dvi/generator_dvi.cpp +++ b/generators/dvi/generator_dvi.cpp @@ -7,8 +7,8 @@ * (at your option) any later version. * ***************************************************************************/ +#include #include -#include #include #include #include diff --git a/generators/fictionbook/converter.cpp b/generators/fictionbook/converter.cpp index 403ee41bb..06e02a18a 100644 --- a/generators/fictionbook/converter.cpp +++ b/generators/fictionbook/converter.cpp @@ -21,8 +21,8 @@ #include #include +#include #include -#include #include "document.h" diff --git a/generators/ooo/converter.cpp b/generators/ooo/converter.cpp index 577d352b6..4486a34e4 100644 --- a/generators/ooo/converter.cpp +++ b/generators/ooo/converter.cpp @@ -19,8 +19,8 @@ #include #include +#include #include -#include #include #include diff --git a/generators/plucker/unpluck/qunpluck.cpp b/generators/plucker/unpluck/qunpluck.cpp index f8374be8d..90d3e9bb7 100644 --- a/generators/plucker/unpluck/qunpluck.cpp +++ b/generators/plucker/unpluck/qunpluck.cpp @@ -24,8 +24,8 @@ #include +#include #include -#include #include "qunpluck.h" #include "image.h" diff --git a/generators/poppler/generator_pdf.cpp b/generators/poppler/generator_pdf.cpp index dcd0563c8..23d0aca0b 100644 --- a/generators/poppler/generator_pdf.cpp +++ b/generators/poppler/generator_pdf.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/ui/pageview.cpp b/ui/pageview.cpp index 743ab2925..726804e1e 100644 --- a/ui/pageview.cpp +++ b/ui/pageview.cpp @@ -64,11 +64,11 @@ #include "annotationguiutils.h" #include "annotationpopup.h" #include "pageviewannotator.h" +#include "core/action.h" #include "core/document.h" #include "core/form.h" #include "core/page.h" #include "core/misc.h" -#include "core/link.h" #include "core/generator.h" #include "settings.h" diff --git a/ui/presentationwidget.cpp b/ui/presentationwidget.cpp index 20ecf8fb8..c8d2ade5a 100644 --- a/ui/presentationwidget.cpp +++ b/ui/presentationwidget.cpp @@ -42,11 +42,11 @@ #include "annotationtools.h" #include "pagepainter.h" #include "presentationsearchbar.h" +#include "core/action.h" #include "core/audioplayer.h" #include "core/document.h" #include "core/generator.h" #include "core/page.h" -#include "core/link.h" #include "settings.h" diff --git a/ui/toc.cpp b/ui/toc.cpp index 2ebc98ab7..205c69dcd 100644 --- a/ui/toc.cpp +++ b/ui/toc.cpp @@ -22,9 +22,9 @@ // local includes #include "pageitemdelegate.h" +#include "core/action.h" #include "core/document.h" #include "core/page.h" -#include "core/link.h" class TOCItem : public QTreeWidgetItem {