diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | fb2edit.pro | 16 | ||||
| -rw-r--r-- | source/fb2app.cpp | 4 | ||||
| -rw-r--r-- | source/fb2app.hpp (renamed from source/fb2app.h) | 0 | ||||
| -rw-r--r-- | source/fb2code.cpp | 2 | ||||
| -rw-r--r-- | source/fb2code.hpp (renamed from source/fb2code.h) | 0 | ||||
| -rw-r--r-- | source/fb2head.cpp | 2 | ||||
| -rw-r--r-- | source/fb2head.hpp (renamed from source/fb2head.h) | 0 | ||||
| -rw-r--r-- | source/fb2main.cpp | 12 | ||||
| -rw-r--r-- | source/fb2main.hpp (renamed from source/fb2main.h) | 0 | ||||
| -rw-r--r-- | source/fb2read.cpp | 2 | ||||
| -rw-r--r-- | source/fb2read.hpp (renamed from source/fb2read.h) | 1 | ||||
| -rw-r--r-- | source/fb2save.cpp | 2 | ||||
| -rw-r--r-- | source/fb2tree.cpp | 2 | ||||
| -rw-r--r-- | source/fb2tree.hpp (renamed from source/fb2tree.h) | 0 | ||||
| -rw-r--r-- | source/fb2view.cpp | 4 | ||||
| -rw-r--r-- | source/fb2view.hpp (renamed from source/fb2view.h) | 0 |
17 files changed, 24 insertions, 25 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fc0f681..bb41fd1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ INCLUDE(${QT_USE_FILE}) ADD_DEFINITIONS(${QT_DEFINITIONS}) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) -file( GLOB FB2_HEAD source/*.h ) +file( GLOB FB2_HEAD source/*.hpp ) file( GLOB FB2_SRCS source/*.cpp ) file( GLOB FB2_UIS source/*.ui ) file( GLOB FB2_TSS source/ts/*.ts ) diff --git a/fb2edit.pro b/fb2edit.pro index 8624f1e..24a2a33 100644 --- a/fb2edit.pro +++ b/fb2edit.pro @@ -1,14 +1,14 @@ HEADERS = \ - source/fb2app.h \ - source/fb2code.h \ - source/fb2head.h \ - source/fb2main.h \ - source/fb2read.h \ - source/fb2tree.h \ source/fb2save.h \ - source/fb2view.h \ source/fb2xml.h \ - source/fb2xml2.h + source/fb2xml2.h \ + source/fb2app.hpp \ + source/fb2code.hpp \ + source/fb2head.hpp \ + source/fb2main.hpp \ + source/fb2read.hpp \ + source/fb2tree.hpp \ + source/fb2view.hpp SOURCES = \ source/fb2app.cpp \ diff --git a/source/fb2app.cpp b/source/fb2app.cpp index 47dcf84..ffd953f 100644 --- a/source/fb2app.cpp +++ b/source/fb2app.cpp @@ -1,8 +1,8 @@ #include <QApplication> #include <QErrorMessage> -#include "fb2app.h" -#include "fb2main.h" +#include "fb2app.hpp" +#include "fb2main.hpp" void Fb2Application::handleMessage(QtMsgType type, const char *msg) { diff --git a/source/fb2app.h b/source/fb2app.hpp index e410058..e410058 100644 --- a/source/fb2app.h +++ b/source/fb2app.hpp diff --git a/source/fb2code.cpp b/source/fb2code.cpp index 12eb5f3..4904b33 100644 --- a/source/fb2code.cpp +++ b/source/fb2code.cpp @@ -1,4 +1,4 @@ -#include "fb2code.h" +#include "fb2code.hpp" ///////////////////////////////////////////////////////////////////////////// // diff --git a/source/fb2code.h b/source/fb2code.hpp index e8e4311..e8e4311 100644 --- a/source/fb2code.h +++ b/source/fb2code.hpp diff --git a/source/fb2head.cpp b/source/fb2head.cpp index add7534..ea08852 100644 --- a/source/fb2head.cpp +++ b/source/fb2head.cpp @@ -1,4 +1,4 @@ -#include "fb2head.h" +#include "fb2head.hpp" #include <QtDebug> #include <QWebFrame> diff --git a/source/fb2head.h b/source/fb2head.hpp index 3d92d0c..3d92d0c 100644 --- a/source/fb2head.h +++ b/source/fb2head.hpp diff --git a/source/fb2main.cpp b/source/fb2main.cpp index 95c1618..2b71812 100644 --- a/source/fb2main.cpp +++ b/source/fb2main.cpp @@ -4,12 +4,12 @@ #include <QWebInspector> #include <QWebFrame> -#include "fb2main.h" -#include "fb2code.h" -#include "fb2read.h" -#include "fb2tree.h" -#include "fb2view.h" -#include "fb2head.h" +#include "fb2main.hpp" +#include "fb2code.hpp" +#include "fb2read.hpp" +#include "fb2tree.hpp" +#include "fb2view.hpp" +#include "fb2head.hpp" #define FB2DELETE(p) { if ( (p) != NULL ) { delete p; p = NULL; } } diff --git a/source/fb2main.h b/source/fb2main.hpp index 01f1d0c..01f1d0c 100644 --- a/source/fb2main.h +++ b/source/fb2main.hpp diff --git a/source/fb2read.cpp b/source/fb2read.cpp index 2f88ead..be40031 100644 --- a/source/fb2read.cpp +++ b/source/fb2read.cpp @@ -1,7 +1,7 @@ #include <QtGui> #include <QtDebug> -#include "fb2read.h" +#include "fb2read.hpp" #include "fb2xml2.h" //--------------------------------------------------------------------------- diff --git a/source/fb2read.h b/source/fb2read.hpp index c97b755..a15bf56 100644 --- a/source/fb2read.h +++ b/source/fb2read.hpp @@ -11,7 +11,6 @@ class Fb2ReadThread : public QThread { Q_OBJECT - public: Fb2ReadThread(QObject *parent, const QString &filename, const QString &xml = QString()); ~Fb2ReadThread(); diff --git a/source/fb2save.cpp b/source/fb2save.cpp index d59ad02..7124d80 100644 --- a/source/fb2save.cpp +++ b/source/fb2save.cpp @@ -2,7 +2,7 @@ #include <QtDebug> #include "fb2save.h" -#include "fb2view.h" +#include "fb2view.hpp" //--------------------------------------------------------------------------- // Fb2SaveWriter diff --git a/source/fb2tree.cpp b/source/fb2tree.cpp index f682189..ea31173 100644 --- a/source/fb2tree.cpp +++ b/source/fb2tree.cpp @@ -1,4 +1,4 @@ -#include "fb2tree.h" +#include "fb2tree.hpp" #include <QtDebug> #include <QWebFrame> diff --git a/source/fb2tree.h b/source/fb2tree.hpp index e227321..e227321 100644 --- a/source/fb2tree.h +++ b/source/fb2tree.hpp diff --git a/source/fb2view.cpp b/source/fb2view.cpp index 3c08558..0eb75e7 100644 --- a/source/fb2view.cpp +++ b/source/fb2view.cpp @@ -1,5 +1,5 @@ -#include "fb2view.h" -#include "fb2read.h" +#include "fb2view.hpp" +#include "fb2read.hpp" #include "fb2save.h" #include "fb2xml2.h" diff --git a/source/fb2view.h b/source/fb2view.hpp index 2618857..2618857 100644 --- a/source/fb2view.h +++ b/source/fb2view.hpp |