From e58b237d5186a0955d72c2bdc50d27a043fa4ace Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Fri, 31 May 2024 17:55:53 +0900
Subject: Restructure zlcore include files and add libzlcore-tqt-dev package

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 fbreader/src/fbreader/FBReaderActions.cpp                           | 2 +-
 fbreader/src/formats/txt/PlainTextFormat.h                          | 2 +-
 fbreader/src/networkActions/AuthenticationDialog.cpp                | 2 +-
 fbreader/src/networkActions/PasswordRecoveryDialog.cpp              | 4 ++--
 fbreader/src/networkActions/RegisterUserDialog.cpp                  | 4 ++--
 fbreader/src/optionsDialog/IntegrationTab.cpp                       | 4 ++--
 fbreader/src/optionsDialog/bookInfo/BookInfoDialog.cpp              | 6 +++---
 fbreader/src/optionsDialog/lookAndFeel/FormatOptionsPage.cpp        | 2 +-
 fbreader/src/optionsDialog/lookAndFeel/LookAndFeelOptionsDialog.cpp | 4 ++--
 fbreader/src/optionsDialog/lookAndFeel/StyleOptionsPage.cpp         | 2 +-
 fbreader/src/optionsDialog/network/NetworkOptionsDialog.cpp         | 4 ++--
 fbreader/src/optionsDialog/reading/IndicatorTab.cpp                 | 2 +-
 fbreader/src/optionsDialog/reading/KeyBindingsTab.cpp               | 4 ++--
 fbreader/src/optionsDialog/reading/ReadingOptionsDialog.cpp         | 4 ++--
 fbreader/src/optionsDialog/system/SystemOptionsDialog.cpp           | 6 +++---
 15 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'fbreader')

diff --git a/fbreader/src/fbreader/FBReaderActions.cpp b/fbreader/src/fbreader/FBReaderActions.cpp
index 4733383..9ca36cf 100644
--- a/fbreader/src/fbreader/FBReaderActions.cpp
+++ b/fbreader/src/fbreader/FBReaderActions.cpp
@@ -23,7 +23,7 @@
 #include <ZLDialogManager.h>
 #include <ZLDialog.h>
 #include <ZLOptionsDialog.h>
-#include <optionEntries/ZLSimpleOptionEntry.h>
+#include <ZLSimpleOptionEntry.h>
 #include <ZLibrary.h>
 
 #include <ZLBlockTreeView.h>
diff --git a/fbreader/src/formats/txt/PlainTextFormat.h b/fbreader/src/formats/txt/PlainTextFormat.h
index 59cc61f..32ca258 100644
--- a/fbreader/src/formats/txt/PlainTextFormat.h
+++ b/fbreader/src/formats/txt/PlainTextFormat.h
@@ -22,7 +22,7 @@
 
 #include <ZLInputStream.h>
 #include <ZLOptions.h>
-#include <optionEntries/ZLSimpleOptionEntry.h>
+#include <ZLSimpleOptionEntry.h>
 #include <ZLResource.h>
 
 #include "../FormatPlugin.h"
diff --git a/fbreader/src/networkActions/AuthenticationDialog.cpp b/fbreader/src/networkActions/AuthenticationDialog.cpp
index 4d59b43..4f4ed1a 100644
--- a/fbreader/src/networkActions/AuthenticationDialog.cpp
+++ b/fbreader/src/networkActions/AuthenticationDialog.cpp
@@ -22,7 +22,7 @@
 #include <ZLOptionsDialog.h>
 #include <ZLOptionEntry.h>
 
-#include <optionEntries/ZLSimpleOptionEntry.h>
+#include <ZLSimpleOptionEntry.h>
 
 #include "../network/NetworkLink.h"
 #include "AuthenticationDialog.h"
diff --git a/fbreader/src/networkActions/PasswordRecoveryDialog.cpp b/fbreader/src/networkActions/PasswordRecoveryDialog.cpp
index ac6fcaf..c02fa15 100644
--- a/fbreader/src/networkActions/PasswordRecoveryDialog.cpp
+++ b/fbreader/src/networkActions/PasswordRecoveryDialog.cpp
@@ -23,8 +23,8 @@
 #include <ZLOptionsDialog.h>
 #include <ZLOptionEntry.h>
 
-#include <optionEntries/ZLSimpleOptionEntry.h>
-#include <optionEntries/ZLStringEditOptionEntry.h>
+#include <ZLSimpleOptionEntry.h>
+#include <ZLStringEditOptionEntry.h>
 
 #include "PasswordRecoveryDialog.h"
 #include "NetworkOperationRunnable.h"
diff --git a/fbreader/src/networkActions/RegisterUserDialog.cpp b/fbreader/src/networkActions/RegisterUserDialog.cpp
index 27aca2b..4d93d8c 100644
--- a/fbreader/src/networkActions/RegisterUserDialog.cpp
+++ b/fbreader/src/networkActions/RegisterUserDialog.cpp
@@ -22,8 +22,8 @@
 #include <ZLOptionsDialog.h>
 #include <ZLOptionEntry.h>
 
-#include <optionEntries/ZLSimpleOptionEntry.h>
-#include <optionEntries/ZLStringEditOptionEntry.h>
+#include <ZLSimpleOptionEntry.h>
+#include <ZLStringEditOptionEntry.h>
 
 
 #include "RegisterUserDialog.h"
diff --git a/fbreader/src/optionsDialog/IntegrationTab.cpp b/fbreader/src/optionsDialog/IntegrationTab.cpp
index c1026f0..ca3ebf0 100644
--- a/fbreader/src/optionsDialog/IntegrationTab.cpp
+++ b/fbreader/src/optionsDialog/IntegrationTab.cpp
@@ -21,8 +21,8 @@
 #include <ZLOptionEntry.h>
 #include <ZLStringUtil.h>
 
-#include <optionEntries/ZLToggleBooleanOptionEntry.h>
-#include <optionEntries/ZLSimpleOptionEntry.h>
+#include <ZLToggleBooleanOptionEntry.h>
+#include <ZLSimpleOptionEntry.h>
 
 #include "AbstractOptionsDialog.h"
 
diff --git a/fbreader/src/optionsDialog/bookInfo/BookInfoDialog.cpp b/fbreader/src/optionsDialog/bookInfo/BookInfoDialog.cpp
index 09b1061..197bd98 100644
--- a/fbreader/src/optionsDialog/bookInfo/BookInfoDialog.cpp
+++ b/fbreader/src/optionsDialog/bookInfo/BookInfoDialog.cpp
@@ -26,9 +26,9 @@
 #include <ZLLanguageList.h>
 #include <ZLStringUtil.h>
 
-#include <optionEntries/ZLStringInfoEntry.h>
-#include <optionEntries/ZLSimpleOptionEntry.h>
-#include <optionEntries/ZLLanguageOptionEntry.h>
+#include <ZLStringInfoEntry.h>
+#include <ZLSimpleOptionEntry.h>
+#include <ZLLanguageOptionEntry.h>
 
 #include "BookInfoDialog.h"
 
diff --git a/fbreader/src/optionsDialog/lookAndFeel/FormatOptionsPage.cpp b/fbreader/src/optionsDialog/lookAndFeel/FormatOptionsPage.cpp
index 3e24b87..0b77548 100644
--- a/fbreader/src/optionsDialog/lookAndFeel/FormatOptionsPage.cpp
+++ b/fbreader/src/optionsDialog/lookAndFeel/FormatOptionsPage.cpp
@@ -19,7 +19,7 @@
 
 #include <ZLOptionsDialog.h>
 
-#include <optionEntries/ZLSimpleOptionEntry.h>
+#include <ZLSimpleOptionEntry.h>
 
 #include <ZLTextStyle.h>
 #include <ZLTextStyleCollection.h>
diff --git a/fbreader/src/optionsDialog/lookAndFeel/LookAndFeelOptionsDialog.cpp b/fbreader/src/optionsDialog/lookAndFeel/LookAndFeelOptionsDialog.cpp
index f33c915..b3c20ce 100644
--- a/fbreader/src/optionsDialog/lookAndFeel/LookAndFeelOptionsDialog.cpp
+++ b/fbreader/src/optionsDialog/lookAndFeel/LookAndFeelOptionsDialog.cpp
@@ -21,8 +21,8 @@
 #include <ZLOptionsDialog.h>
 #include <ZLPaintContext.h>
 
-#include <optionEntries/ZLSimpleOptionEntry.h>
-#include <optionEntries/ZLColorOptionBuilder.h>
+#include <ZLSimpleOptionEntry.h>
+#include <ZLColorOptionBuilder.h>
 
 #include <ZLTextStyleCollection.h>
 
diff --git a/fbreader/src/optionsDialog/lookAndFeel/StyleOptionsPage.cpp b/fbreader/src/optionsDialog/lookAndFeel/StyleOptionsPage.cpp
index 6fc00e6..c2086d1 100644
--- a/fbreader/src/optionsDialog/lookAndFeel/StyleOptionsPage.cpp
+++ b/fbreader/src/optionsDialog/lookAndFeel/StyleOptionsPage.cpp
@@ -20,7 +20,7 @@
 #include <ZLOptionsDialog.h>
 #include <ZLPaintContext.h>
 
-#include <optionEntries/ZLSimpleOptionEntry.h>
+#include <ZLSimpleOptionEntry.h>
 
 #include <ZLTextView.h>
 #include <ZLTextStyle.h>
diff --git a/fbreader/src/optionsDialog/network/NetworkOptionsDialog.cpp b/fbreader/src/optionsDialog/network/NetworkOptionsDialog.cpp
index aa165e1..c7c4b10 100644
--- a/fbreader/src/optionsDialog/network/NetworkOptionsDialog.cpp
+++ b/fbreader/src/optionsDialog/network/NetworkOptionsDialog.cpp
@@ -26,8 +26,8 @@
 #include <ZLOptionEntry.h>
 #include <ZLOptionsDialog.h>
 #include <ZLNetworkManager.h>
-#include <optionEntries/ZLSimpleOptionEntry.h>
-#include <optionEntries/ZLToggleBooleanOptionEntry.h>
+#include <ZLSimpleOptionEntry.h>
+#include <ZLToggleBooleanOptionEntry.h>
 
 #include "../../fbreader/FBReader.h"
 
diff --git a/fbreader/src/optionsDialog/reading/IndicatorTab.cpp b/fbreader/src/optionsDialog/reading/IndicatorTab.cpp
index ac8b549..2049b16 100644
--- a/fbreader/src/optionsDialog/reading/IndicatorTab.cpp
+++ b/fbreader/src/optionsDialog/reading/IndicatorTab.cpp
@@ -19,7 +19,7 @@
 
 #include <ZLOptionsDialog.h>
 
-#include <optionEntries/ZLToggleBooleanOptionEntry.h>
+#include <ZLToggleBooleanOptionEntry.h>
 
 #include <ZLTextStyleOptions.h>
 
diff --git a/fbreader/src/optionsDialog/reading/KeyBindingsTab.cpp b/fbreader/src/optionsDialog/reading/KeyBindingsTab.cpp
index 4d4cc10..b522578 100644
--- a/fbreader/src/optionsDialog/reading/KeyBindingsTab.cpp
+++ b/fbreader/src/optionsDialog/reading/KeyBindingsTab.cpp
@@ -21,8 +21,8 @@
 #include <ZLApplication.h>
 #include <ZLOptionEntry.h>
 
-#include <optionEntries/ZLSimpleOptionEntry.h>
-#include <optionEntries/ZLSimpleKeyOptionEntry.h>
+#include <ZLSimpleOptionEntry.h>
+#include <ZLSimpleKeyOptionEntry.h>
 
 #include "ReadingOptionsDialog.h"
 
diff --git a/fbreader/src/optionsDialog/reading/ReadingOptionsDialog.cpp b/fbreader/src/optionsDialog/reading/ReadingOptionsDialog.cpp
index 1ccb54d..98c079f 100644
--- a/fbreader/src/optionsDialog/reading/ReadingOptionsDialog.cpp
+++ b/fbreader/src/optionsDialog/reading/ReadingOptionsDialog.cpp
@@ -20,8 +20,8 @@
 #include <ZLDialogManager.h>
 #include <ZLOptionsDialog.h>
 
-#include <optionEntries/ZLSimpleOptionEntry.h>
-#include <optionEntries/ZLToggleBooleanOptionEntry.h>
+#include <ZLSimpleOptionEntry.h>
+#include <ZLToggleBooleanOptionEntry.h>
 
 #include "ReadingOptionsDialog.h"
 
diff --git a/fbreader/src/optionsDialog/system/SystemOptionsDialog.cpp b/fbreader/src/optionsDialog/system/SystemOptionsDialog.cpp
index 91b3c7a..aadc669 100644
--- a/fbreader/src/optionsDialog/system/SystemOptionsDialog.cpp
+++ b/fbreader/src/optionsDialog/system/SystemOptionsDialog.cpp
@@ -22,9 +22,9 @@
 #include <ZLLanguageList.h>
 #include <ZLOptionEntry.h>
 
-#include <optionEntries/ZLSimpleOptionEntry.h>
-#include <optionEntries/ZLLanguageOptionEntry.h>
-#include <optionEntries/ZLToggleBooleanOptionEntry.h>
+#include <ZLSimpleOptionEntry.h>
+#include <ZLLanguageOptionEntry.h>
+#include <ZLToggleBooleanOptionEntry.h>
 
 #include "SystemOptionsDialog.h"
 
-- 
cgit v1.2.3