Compare commits

...

3 commits

Author SHA1 Message Date
shenleban tongying 618310f772
clean: just use #pragma once
Some checks are pending
SonarCloud / Build and analyze (push) Waiting to run
2024-11-06 22:53:04 -05:00
shenleban tongying f8f62efa6e fix: deploy qt translations for macOS 2024-11-06 20:33:05 -05:00
shenleban tongying a61bcb1629 fix: properly load qt and webengine translations, delete GD's custom ones 2024-11-06 20:19:53 -05:00
134 changed files with 172 additions and 21072 deletions

View file

@ -266,15 +266,25 @@ if (APPLE)
set(Assembling_Dir "${CMAKE_BINARY_DIR}/redist")
set(App_Name "${GOLDENDICT}.app")
set(Redistributable_APP "${Assembling_Dir}/${App_Name}")
# if anything wrong, delete this and affect lines, and see what's Qt will generate by default.
set(QtConfPath "${Redistributable_APP}/Contents/Resources/qt.conf")
qt_generate_deploy_script(
TARGET ${GOLDENDICT}
OUTPUT_SCRIPT deploy_script
CONTENT "qt_deploy_runtime_dependencies(
CONTENT "
set(QT_DEPLOY_PREFIX \"${Redistributable_APP}\")
set(QT_DEPLOY_TRANSLATIONS_DIR \"Contents/Resources/translations\")
qt_deploy_runtime_dependencies(
EXECUTABLE \"${Redistributable_APP}\"
GENERATE_QT_CONF
NO_APP_STORE_COMPLIANCE
)"
NO_APP_STORE_COMPLIANCE)
qt_deploy_translations()
qt_deploy_qt_conf(\"${QtConfPath}\"
PLUGINS_DIR PlugIns
TRANSLATIONS_DIR Resources/translations)
"
)
install(TARGETS ${GOLDENDICT} BUNDLE DESTINATION "${Assembling_Dir}")

View file

@ -1,3 +0,0 @@
qtwebengine_zh_CN.ts is used to fixed some right context menu on webengine.
The previous qt_* rename to qt_extra_* to distinguish between the locale language.These qt_extra*.ts are also used to fix GUI translation issues as qt has not provided an update version about these language.

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -1,467 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="zh_CN">
<context>
<name>DownloadInterruptReason</name>
<message>
<source>Unknown reason or not interrupted</source>
<translation></translation>
</message>
<message>
<source>General file operation failure</source>
<translation></translation>
</message>
<message>
<source>The file cannot be written locally, due to access restrictions</source>
<translation>访</translation>
</message>
<message>
<source>Insufficient space on the target drive</source>
<translation></translation>
</message>
<message>
<source>The directory or file name is too long</source>
<translation></translation>
</message>
<message>
<source>The file size exceeds the file system limitation</source>
<translation></translation>
</message>
<message>
<source>The file is infected with a virus</source>
<translation></translation>
</message>
<message>
<source>Temporary problem (for example file in use, or too many open files)</source>
<translation>使</translation>
</message>
<message>
<source>The file was blocked due to local policy</source>
<translation></translation>
</message>
<message>
<source>Checking the safety of the download failed due to unexpected reasons</source>
<translation></translation>
</message>
<message>
<source>File seek past the end of a file (resuming previously interrupted download)</source>
<translation></translation>
</message>
<message>
<source>The partial file did not match the expected hash</source>
<translation></translation>
</message>
<message>
<source>General network failure</source>
<translation></translation>
</message>
<message>
<source>The network operation has timed out</source>
<translation></translation>
</message>
<message>
<source>The network connection has been terminated</source>
<translation></translation>
</message>
<message>
<source>The server has gone down</source>
<translation></translation>
</message>
<message>
<source>The network request was invalid (for example, the URL or scheme is invalid)</source>
<translation>URL或scheme无效</translation>
</message>
<message>
<source>General server failure</source>
<translation></translation>
</message>
<message>
<source>The server does not have the requested data</source>
<translation></translation>
</message>
<message>
<source>The server did not authorize access to the resource</source>
<translation>访</translation>
</message>
<message>
<source>A problem with the server certificate occurred</source>
<translation></translation>
</message>
<message>
<source>Access forbidden by the server</source>
<translation>访</translation>
</message>
<message>
<source>Unexpected server response</source>
<translation></translation>
</message>
<message>
<source>Download canceled by the user</source>
<translation></translation>
</message>
</context>
<context>
<name>QQuickPdfDocument</name>
<message>
<source>no error</source>
<translation></translation>
</message>
<message>
<source>data not yet available</source>
<translation></translation>
</message>
<message>
<source>file not found</source>
<translation></translation>
</message>
<message>
<source>invalid file format</source>
<translation></translation>
</message>
<message>
<source>incorrect password</source>
<translation></translation>
</message>
<message>
<source>unsupported security scheme</source>
<translation></translation>
</message>
<message>
<source>unknown error</source>
<translation></translation>
</message>
</context>
<context>
<name>QQuickWebEngineView</name>
<message>
<source>Stop</source>
<translation></translation>
</message>
<message>
<source>Reload and Bypass Cache</source>
<translation></translation>
</message>
<message>
<source>Open link in this window</source>
<translation></translation>
</message>
<message>
<source>Toggle Play/Pause</source>
<translation>/</translation>
</message>
<message>
<source>Toggle Mute</source>
<translation></translation>
</message>
<message>
<source>Close Page</source>
<translation></translation>
</message>
<message>
<source>Unselect</source>
<translation></translation>
</message>
<message>
<source>&amp;Bold</source>
<translation>&amp;B</translation>
</message>
<message>
<source>&amp;Italic</source>
<translation>&amp;I</translation>
</message>
<message>
<source>&amp;Underline</source>
<translation>线&amp;U</translation>
</message>
<message>
<source>&amp;Strikethrough</source>
<translation>线(&amp;S)</translation>
</message>
<message>
<source>Align &amp;Left</source>
<translation>&amp;L</translation>
</message>
<message>
<source>Align &amp;Center</source>
<translation>&amp;C</translation>
</message>
<message>
<source>Align &amp;Right</source>
<translation>&amp;R</translation>
</message>
<message>
<source>Align &amp;Justified</source>
<translation>&amp;J</translation>
</message>
<message>
<source>&amp;Indent</source>
<translation>&amp;I</translation>
</message>
<message>
<source>&amp;Outdent</source>
<translation>(&amp;O)</translation>
</message>
<message>
<source>Insert &amp;Ordered List</source>
<translation>&amp;O</translation>
</message>
<message>
<source>Insert &amp;Unordered List</source>
<translation>&amp;U</translation>
</message>
</context>
<context>
<name>QWebEnginePage</name>
<message>
<source>Stop</source>
<translation></translation>
</message>
<message>
<source>Reload and Bypass Cache</source>
<translation></translation>
</message>
<message>
<source>Toggle Play/Pause</source>
<translation>/</translation>
</message>
<message>
<source>Toggle Mute</source>
<translation></translation>
</message>
<message>
<source>Close Page</source>
<translation></translation>
</message>
<message>
<source>Unselect</source>
<translation></translation>
</message>
<message>
<source>Are you sure you want to leave this page? Changes that you made may not be saved.</source>
<translation> </translation>
</message>
<message>
<source>Open link in this window</source>
<translation></translation>
</message>
<message>
<source>Open link in new background tab</source>
<translation></translation>
</message>
<message>
<source>&amp;Bold</source>
<translation>&amp;B</translation>
</message>
<message>
<source>&amp;Italic</source>
<translation>&amp;I</translation>
</message>
<message>
<source>&amp;Underline</source>
<translation>线&amp;U</translation>
</message>
<message>
<source>&amp;Strikethrough</source>
<translation>线&amp;S</translation>
</message>
<message>
<source>Align &amp;Left</source>
<translation>&amp;L</translation>
</message>
<message>
<source>Align &amp;Center</source>
<translation>&amp;C</translation>
</message>
<message>
<source>Align &amp;Right</source>
<translation>&amp;R</translation>
</message>
<message>
<source>Align &amp;Justified</source>
<translation>&amp;J</translation>
</message>
<message>
<source>&amp;Indent</source>
<translation>&amp;I</translation>
</message>
<message>
<source>&amp;Outdent</source>
<translation>(&amp;O)</translation>
</message>
<message>
<source>Insert &amp;Ordered List</source>
<translation>&amp;O</translation>
</message>
<message>
<source>Insert &amp;Unordered List</source>
<translation>&amp;U</translation>
</message>
<message>
<source>Select folder to upload</source>
<translation></translation>
</message>
</context>
<context>
<name>QtWebEnginePlugin</name>
<message>
<source>Cannot create separate instance of WebEngineNewViewRequest</source>
<translation> WebEngineNewViewRequest </translation>
</message>
<message>
<source>Cannot create separate instance of %1</source>
<translation> %1 </translation>
</message>
</context>
<context>
<name>QtWebEngineTestSupportPlugin</name>
<message>
<source>Cannot create a separate instance of WebEngineErrorPage</source>
<translation> WebEngineErrorPage </translation>
</message>
<message>
<source>Cannot create a separate instance of WebEngineTestEvent</source>
<translation> WebEngineTestEvent </translation>
</message>
</context>
<context>
<name>RenderViewContextMenuQt</name>
<message>
<source>Back</source>
<translation>退</translation>
</message>
<message>
<source>Forward</source>
<translation></translation>
</message>
<message>
<source>Reload</source>
<translation></translation>
</message>
<message>
<source>Cut</source>
<translation></translation>
</message>
<message>
<source>Copy</source>
<translation></translation>
</message>
<message>
<source>Paste</source>
<translation></translation>
</message>
<message>
<source>Undo</source>
<translation></translation>
</message>
<message>
<source>Redo</source>
<translation></translation>
</message>
<message>
<source>Select all</source>
<translation></translation>
</message>
<message>
<source>Paste and match style</source>
<translation></translation>
</message>
<message>
<source>Open link in new window</source>
<translation></translation>
</message>
<message>
<source>Open link in new tab</source>
<translation></translation>
</message>
<message>
<source>Copy link address</source>
<translation></translation>
</message>
<message>
<source>Save link</source>
<translation></translation>
</message>
<message>
<source>Copy image</source>
<translation></translation>
</message>
<message>
<source>Copy image address</source>
<translation></translation>
</message>
<message>
<source>Save image</source>
<translation></translation>
</message>
<message>
<source>Copy media address</source>
<translation></translation>
</message>
<message>
<source>Show controls</source>
<translation></translation>
</message>
<message>
<source>Loop</source>
<translation></translation>
</message>
<message>
<source>Save media</source>
<translation></translation>
</message>
<message>
<source>Inspect</source>
<translation></translation>
</message>
<message>
<source>Exit full screen</source>
<translation>退</translation>
</message>
<message>
<source>Save page</source>
<translation></translation>
</message>
<message>
<source>View page source</source>
<translation></translation>
</message>
</context>
<context>
<name>UIDelegatesManager</name>
<message>
<source>Javascript Alert - %1</source>
<translation>Javascript- - %1</translation>
</message>
<message>
<source>Javascript Confirm - %1</source>
<translation>Javascript- - %1</translation>
</message>
<message>
<source>Javascript Prompt - %1</source>
<translation>Javascript- - %1</translation>
</message>
<message>
<source>Are you sure you want to leave this page?</source>
<translation></translation>
</message>
<message>
<source>Changes that you made may not be saved.</source>
<translation></translation>
</message>
<message>
<source>Connect to proxy &quot;%1&quot; using:</source>
<translation>使%1</translation>
</message>
<message>
<source>Enter username and password for &quot;%1&quot; at %2://%3</source>
<translation> %2://%3 输入“%1”的用户名和密码</translation>
</message>
</context>
<context>
<name>WebContentsAdapter</name>
<message>
<source>HTTP-POST data can only be sent over HTTP(S) protocol</source>
<translation>HTTP-POST HTTP(S) </translation>
</message>
</context>
</TS>

View file

@ -1,5 +1,4 @@
#ifndef ANKICONNECTOR_H
#define ANKICONNECTOR_H
#pragma once
#include "config.hh"
@ -29,5 +28,3 @@ signals:
private slots:
void finishedSlot( QNetworkReply * reply );
};
#endif // ANKICONNECTOR_H

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __ARTICLE_MAKER_HH_INCLUDED__
#define __ARTICLE_MAKER_HH_INCLUDED__
#pragma once
#include <QObject>
#include <QMap>
@ -158,6 +157,3 @@ private:
int findEndOfCloseDiv( QString const &, int pos );
bool isCollapsable( Dictionary::DataRequest & req, QString const & dictId );
};
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __ARTICLE_NETMGR_HH_INCLUDED__
#define __ARTICLE_NETMGR_HH_INCLUDED__
#pragma once
#include <QtNetwork>
#include <QSet>
@ -242,4 +241,3 @@ private:
ArticleNetworkAccessManager & mManager;
QNetworkAccessManager mgr;
};
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __AUDIOLINK_HH_INCLUDED__
#define __AUDIOLINK_HH_INCLUDED__
#pragma once
#include <QString>
@ -15,5 +14,3 @@
/// The dictionary id is used to make active dictionary feature work.
std::string addAudioLink( std::string const & url, std::string const & dictionaryId );
std::string addAudioLink( QString const & url, std::string const & dictionaryId );
#endif

View file

@ -1,5 +1,4 @@
#ifndef AUDIOOUTPUT_H
#define AUDIOOUTPUT_H
#pragma once
#include <QObject>
#include <QScopedPointer>
@ -22,6 +21,3 @@ private:
Q_DISABLE_COPY( AudioOutput )
Q_DECLARE_PRIVATE( AudioOutput )
};
#endif // AUDIOOUTPUT_H

View file

@ -1,8 +1,7 @@
/* This file is (c) 2018 Igor Kushnir <igorkuo@gmail.com>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef AUDIOPLAYERFACTORY_HH_INCLUDED
#define AUDIOPLAYERFACTORY_HH_INCLUDED
#pragma once
#include "audioplayerinterface.hh"
#include "config.hh"
@ -33,5 +32,3 @@ private:
QString audioPlaybackProgram;
AudioPlayerPtr playerPtr;
};
#endif // AUDIOPLAYERFACTORY_HH_INCLUDED

View file

@ -1,8 +1,7 @@
/* This file is (c) 2018 Igor Kushnir <igorkuo@gmail.com>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef AUDIOPLAYERINTERFACE_HH_INCLUDED
#define AUDIOPLAYERINTERFACE_HH_INCLUDED
#pragma once
#include <QScopedPointer>
#include <QString>
@ -27,5 +26,3 @@ signals:
};
using AudioPlayerPtr = QScopedPointer< AudioPlayerInterface >;
#endif // AUDIOPLAYERINTERFACE_HH_INCLUDED

View file

@ -1,7 +1,5 @@
#ifndef BASE_TYPE_H
#define BASE_TYPE_H
#pragma once
#include <QString>
using Contexts = QMap< QString, QString >;
#endif // BASE_TYPE_H

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __EX_HH_INCLUDED__
#define __EX_HH_INCLUDED__
#pragma once
#include <string>
@ -47,5 +46,3 @@
} \
virtual ~exName() noexcept {} \
};
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __FILETYPE_HH_INCLUDED__
#define __FILETYPE_HH_INCLUDED__
#pragma once
#include <string>
@ -31,5 +30,3 @@ bool isNameOfCSS( string const & );
bool isNameOfSvg( string const & name );
} // namespace Filetype
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __FOLDING_HH_INCLUDED__
#define __FOLDING_HH_INCLUDED__
#pragma once
#include "wstring.hh"
#include <QString>
@ -90,5 +89,3 @@ QString escapeWildcardSymbols( QString const & );
bool isCombiningMark( wchar ch );
} // namespace Folding
#endif

View file

@ -1,5 +1,4 @@
#ifndef __GDDEBUG_HH_INCLUDED__
#define __GDDEBUG_HH_INCLUDED__
#pragma once
#include <QFile>
@ -28,5 +27,3 @@ void gdDebug( const char *, ... )
;
extern QFile * logFilePtr;
#endif // __GDDEBUG_HH_INCLUDED__

View file

@ -1,5 +1,4 @@
#ifndef GLOBAL_GLOBALBROADCASTER_H
#define GLOBAL_GLOBALBROADCASTER_H
#pragma once
#include <QObject>
#include <vector>
@ -47,5 +46,3 @@ signals:
void indexingDictionary( QString );
};
#endif // GLOBAL_GLOBALBROADCASTER_H

View file

@ -1,5 +1,4 @@
#ifndef GLOBALREGEX_HH
#define GLOBALREGEX_HH
#pragma once
#include <QRegularExpression>
@ -78,5 +77,3 @@ const static QRegularExpression markSpace( R"([\p{M}\p{Z}\p{C}])", QRegularExpre
const static QRegularExpression whiteSpace( "\\s+" );
} // namespace RX
#endif // GLOBALREGEX_HH

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __HTMLESCAPE_HH_INCLUDED__
#define __HTMLESCAPE_HH_INCLUDED__
#pragma once
#include <QString>
#include <string>
@ -33,5 +32,3 @@ QString fromHtmlEscaped( QString const & str );
string unescapeUtf8( string const & str, HtmlOption option = HtmlOption::Strip );
} // namespace Html
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __ICONV_HH_INCLUDED__
#define __ICONV_HH_INCLUDED__
#pragma once
#include <QString>
@ -47,5 +46,3 @@ public:
// Copying/assigning isn't supported
Q_DISABLE_COPY_MOVE( Iconv );
};
#endif

View file

@ -1,11 +1,9 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __SPTR_HH_INCLUDED__
#define __SPTR_HH_INCLUDED__
#pragma once
#include <memory>
// A shorthand for std::shared_ptr
template< class T >
using sptr = std::shared_ptr< T >;
#endif

View file

@ -1,7 +1,6 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __UTF8_HH_INCLUDED__
#define __UTF8_HH_INCLUDED__
#pragma once
#include <cstdio>
#include <QByteArray>
@ -67,5 +66,3 @@ struct LineFeed
LineFeed initLineFeed( Encoding e );
} // namespace Utf8
#endif

View file

@ -1,7 +1,6 @@
/* Thin wrappers for retaining compatibility for both Qt6.x and Qt5.x */
#ifndef UTILS_HH
#define UTILS_HH
#pragma once
#include <QAtomicInt>
#include <QJsonDocument>
@ -350,5 +349,3 @@ QString escapeAmps( QString const & str );
QString unescapeAmps( QString const & str );
} // namespace Utils
#endif // UTILS_HH

View file

@ -1,8 +1,5 @@
#ifndef __WILCARD_HH_INCLUDED__
#define __WILCARD_HH_INCLUDED__
#pragma once
#include <QString>
QString wildcardsToRegexp( const QString & wc_str );
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __WSTRING_QT_HH_INCLUDED__
#define __WSTRING_QT_HH_INCLUDED__
#pragma once
/// This file adds conversions between gd::wstring and QString. See wstring.hh
/// for more details on gd::wstring.
@ -16,5 +15,3 @@ wstring removeTrailingZero( wstring const & v );
wstring removeTrailingZero( QString const & in );
wstring normalize( wstring const & );
} // namespace gd
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __CONFIG_HH_INCLUDED__
#define __CONFIG_HH_INCLUDED__
#pragma once
#include <QObject>
#include <QList>
@ -1028,5 +1027,3 @@ QString getStylesDir();
QString getCacheDir() noexcept;
} // namespace Config
#endif

View file

@ -1,5 +1,4 @@
#ifndef __DELEGATE_HH_INCLUDED__
#define __DELEGATE_HH_INCLUDED__
#pragma once
#include <QAbstractItemDelegate>
#include <QStyledItemDelegate>
@ -13,5 +12,3 @@ public:
private:
QStyledItemDelegate * mainDelegate;
};
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __AARD_HH_INCLUDED__
#define __AARD_HH_INCLUDED__
#pragma once
#include "dictionary.hh"
@ -18,5 +17,3 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
unsigned maxHeadwordsToExpand );
} // namespace Aard
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2013 Maksim Tamkovicz <quendimax@gmail.com>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __BELARUSIANTRANSLIT_HH_INCLUDED__
#define __BELARUSIANTRANSLIT_HH_INCLUDED__
#pragma once
#include <vector>
#include "dictionary.hh"
@ -12,5 +11,3 @@ namespace BelarusianTranslit {
std::vector< sptr< Dictionary::Class > > makeDictionaries();
}
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __BGL_HH_INCLUDED__
#define __BGL_HH_INCLUDED__
#pragma once
#include "dictionary.hh"
@ -23,5 +22,3 @@ vector< sptr< Dictionary::Class > >
makeDictionaries( vector< string > const & fileNames, string const & indicesDir, Dictionary::Initializing & );
} // namespace Bgl
#endif

View file

@ -18,8 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#ifndef BABYLON_H
#define BABYLON_H
#pragma once
#include <stdlib.h>
#include <zlib.h>
@ -229,5 +228,3 @@ private:
BGL_TARGET_CHARSET
};
};
#endif // BABYLON_H

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __BTREEIDX_HH_INCLUDED__
#define __BTREEIDX_HH_INCLUDED__
#pragma once
#include "dict/dictionary.hh"
#include "dictfile.hh"
@ -270,5 +269,3 @@ struct IndexedWords: public map< string, vector< WordArticleLink > >
IndexInfo buildIndex( IndexedWords const &, File::Index & file );
} // namespace BtreeIndexing
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2015 Zhe Wang <0x1997@gmail.com>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __CHINESE_HH_INCLUDED__
#define __CHINESE_HH_INCLUDED__
#pragma once
#include <map>
#include "config.hh"
@ -13,5 +12,3 @@ namespace Chinese {
std::vector< sptr< Dictionary::Class > > makeDictionaries( Config::Chinese const & );
}
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __CHUNKEDSTORAGE_HH_INCLUDED__
#define __CHUNKEDSTORAGE_HH_INCLUDED__
#pragma once
#include "ex.hh"
#include "dictfile.hh"
@ -86,5 +85,3 @@ public:
};
} // namespace ChunkedStorage
#endif

View file

@ -1,5 +1,4 @@
#ifndef CUSTOMTRANSLITERATION_HH
#define CUSTOMTRANSLITERATION_HH
#pragma once
#include <vector>
@ -23,4 +22,3 @@ private:
std::vector< sptr< Dictionary::Class > > makeDictionaries( Config::CustomTrans const & );
} // namespace CustomTranslit
#endif // CUSTOMTRANSLITERATION_HH

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __DICTDFILES_HH_INCLUDED__
#define __DICTDFILES_HH_INCLUDED__
#pragma once
#include "dict/dictionary.hh"
@ -16,5 +15,3 @@ vector< sptr< Dictionary::Class > >
makeDictionaries( vector< string > const & fileNames, string const & indicesDir, Dictionary::Initializing & );
} // namespace DictdFiles
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __DICTIONARY_HH_INCLUDED__
#define __DICTIONARY_HH_INCLUDED__
#pragma once
#include <map>
#include <string>
@ -584,5 +583,3 @@ QString generateRandomDictionaryId();
QMap< std::string, sptr< Dictionary::Class > > dictToMap( std::vector< sptr< Dictionary::Class > > const & dicts );
} // namespace Dictionary
#endif

View file

@ -1,5 +1,4 @@
#ifndef __DICTSERVER_HH__INCLUDED__
#define __DICTSERVER_HH__INCLUDED__
#pragma once
#include "dict/dictionary.hh"
#include "config.hh"
@ -13,5 +12,3 @@ using std::string;
vector< sptr< Dictionary::Class > > makeDictionaries( Config::DictServers const & servers );
} // namespace DictServer
#endif // __DICTSERVER_HH__INCLUDED__

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __DSL_HH_INCLUDED__
#define __DSL_HH_INCLUDED__
#pragma once
#include "dictionary.hh"
@ -18,5 +17,3 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
unsigned int maxHeadwordSize );
} // namespace Dsl
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __DSL_DETAILS_HH_INCLUDED__
#define __DSL_DETAILS_HH_INCLUDED__
#pragma once
#include <string>
#include <list>
@ -223,5 +222,3 @@ quint32 dslLanguageToId( wstring const & name );
} // namespace Details
} // namespace Dsl
#endif

View file

@ -1,5 +1,4 @@
#ifndef __EPWING_HH__INCLUDED__
#define __EPWING_HH__INCLUDED__
#pragma once
#include "dict/dictionary.hh"
#include "epwing_book.hh"
@ -20,5 +19,3 @@ void addWordToChunks( Epwing::Book::EpwingHeadword & head,
vector< sptr< Dictionary::Class > >
makeDictionaries( vector< string > const & fileNames, string const & indicesDir, Dictionary::Initializing & );
} // namespace Epwing
#endif // __EPWING_HH__INCLUDED__

View file

@ -1,5 +1,4 @@
#ifndef __EPWING_BOOK_HH_INCLUDED__
#define __EPWING_BOOK_HH_INCLUDED__
#pragma once
#include "dict/dictionary.hh"
#include "ex.hh"
@ -270,6 +269,3 @@ struct EContainer
} // namespace Book
} // namespace Epwing
#endif // __EPWING_BOOK_HH_INCLUDED__

View file

@ -1,5 +1,4 @@
#ifndef __EPWING_CHARMAP_HH_INCLUDED_
#define __EPWING_CHARMAP_HH_INCLUDED_
#pragma once
#include <QByteArray>
#include <QMap>
@ -22,5 +21,3 @@ private:
};
} // namespace Epwing
#endif // __EPWING_CHARMAP_HH_INCLUDED_

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __FORVO_HH_INCLUDED__
#define __FORVO_HH_INCLUDED__
#pragma once
#include "dictionary.hh"
#include "config.hh"
@ -15,5 +14,3 @@ std::vector< sptr< Dictionary::Class > >
makeDictionaries( Dictionary::Initializing &, Config::Forvo const &, QNetworkAccessManager & );
} // namespace Forvo
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef GERMAN_HH
#define GERMAN_HH
#pragma once
#include "dictionary.hh"
@ -11,5 +10,3 @@ namespace GermanTranslit {
sptr< Dictionary::Class > makeDictionary();
}
#endif // GERMAN_HH

View file

@ -1,5 +1,4 @@
#ifndef __GLS_HH_INCLUDED__
#define __GLS_HH_INCLUDED__
#pragma once
#include "dictionary.hh"
@ -13,5 +12,3 @@ vector< sptr< Dictionary::Class > >
makeDictionaries( vector< string > const & fileNames, string const & indicesDir, Dictionary::Initializing & );
} // namespace Gls
#endif // __GLS_HH_INCLUDED__

View file

@ -1,8 +1,7 @@
/* This file is (c) 2010 Jennie Petoumenou <epetoumenou@gmail.com>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef GREEKTRANSLIT_HH
#define GREEKTRANSLIT_HH
#pragma once
#include "dictionary.hh"
@ -11,5 +10,3 @@ namespace GreekTranslit {
sptr< Dictionary::Class > makeDictionary();
}
#endif // GREEKTRANSLIT_HH

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __HUNSPELL_HH_INCLUDED__
#define __HUNSPELL_HH_INCLUDED__
#pragma once
#ifdef _MSC_VER
#define HUNSPELL_STATIC
@ -41,5 +40,3 @@ vector< DataFiles > findDataFiles( QString const & path );
vector< sptr< Dictionary::Class > > makeDictionaries( Config::Hunspell const & );
} // namespace HunspellMorpho
#endif

View file

@ -1,5 +1,4 @@
#ifndef GOLDENDICT_LINGUALIBRE_H
#define GOLDENDICT_LINGUALIBRE_H
#pragma once
#include "dictionary.hh"
#include "config.hh"
@ -11,5 +10,3 @@ std::vector< sptr< Dictionary::Class > >
makeDictionaries( Dictionary::Initializing &, Config::Lingua const &, QNetworkAccessManager & );
} // namespace Lingua
#endif //GOLDENDICT_LINGUALIBRE_H

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __LOADDICTIONARIES_HH_INCLUDED__
#define __LOADDICTIONARIES_HH_INCLUDED__
#pragma once
#include "initializing.hh"
#include "config.hh"
@ -75,4 +74,3 @@ void loadDictionaries( QWidget * parent,
/// Runs deferredInit() on all the given dictionaries. Useful when
/// loadDictionaries() was previously called with doDeferredInit = false.
void doDeferredInit( std::vector< sptr< Dictionary::Class > > & );
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __L9SA_HH_INCLUDED__
#define __L9SA_HH_INCLUDED__
#pragma once
#include "dictionary.hh"
@ -16,5 +15,3 @@ vector< sptr< Dictionary::Class > >
makeDictionaries( vector< string > const & fileNames, string const & indicesDir, Dictionary::Initializing & );
} // namespace Lsa
#endif

View file

@ -18,8 +18,7 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
#ifndef __MDICTPARSER_HH_INCLUDED__
#define __MDICTPARSER_HH_INCLUDED__
#pragma once
#include <string>
#include <vector>
@ -215,5 +214,3 @@ protected:
};
} // namespace Mdict
#endif // __MDICTPARSER_HH_INCLUDED__

View file

@ -1,8 +1,7 @@
/* This file is (c) 2013 Timon Wong <timon86.wang AT gmail DOT com>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __MDX_HH_INCLUDED__
#define __MDX_HH_INCLUDED__
#pragma once
#include "dictionary.hh"
@ -15,5 +14,3 @@ vector< sptr< Dictionary::Class > >
makeDictionaries( vector< string > const & fileNames, string const & indicesDir, Dictionary::Initializing & );
} // namespace Mdx
#endif // __MDX_HH_INCLUDED__

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __MEDIAWIKI_HH_INCLUDED__
#define __MEDIAWIKI_HH_INCLUDED__
#pragma once
#include "dictionary.hh"
#include "config.hh"
@ -18,5 +17,3 @@ makeDictionaries( Dictionary::Initializing &, Config::MediaWikis const & wikis,
} // namespace MediaWiki
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __PROGRAMS_HH_INCLUDED__
#define __PROGRAMS_HH_INCLUDED__
#pragma once
#include <QProcess>
#include "dictionary.hh"
@ -79,5 +78,3 @@ private slots:
};
} // namespace Programs
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __ROMAJI_HH_INCLUDED__
#define __ROMAJI_HH_INCLUDED__
#pragma once
#include "transliteration.hh"
#include "config.hh"
@ -14,5 +13,3 @@ using std::vector;
vector< sptr< Dictionary::Class > > makeDictionaries( Config::Romaji const & );
} // namespace Romaji
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __RUSSIANTRANSLIT_HH_INCLUDED__
#define __RUSSIANTRANSLIT_HH_INCLUDED__
#pragma once
#include "dictionary.hh"
@ -11,5 +10,3 @@ namespace RussianTranslit {
sptr< Dictionary::Class > makeDictionary();
}
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __SDICT_HH_INCLUDED__
#define __SDICT_HH_INCLUDED__
#pragma once
#include "dictionary.hh"
@ -16,5 +15,3 @@ vector< sptr< Dictionary::Class > >
makeDictionaries( vector< string > const & fileNames, string const & indicesDir, Dictionary::Initializing & );
} // namespace Sdict
#endif

View file

@ -1,5 +1,4 @@
#ifndef __SLOB_HH_INCLUDED__
#define __SLOB_HH_INCLUDED__
#pragma once
#include "dictionary.hh"
@ -15,5 +14,3 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
unsigned maxHeadwordsToExpand );
} // namespace Slob
#endif // __SLOB_HH_INCLUDED__

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __SOUNDDIR_HH_INCLUDED__
#define __SOUNDDIR_HH_INCLUDED__
#pragma once
#include "dictionary.hh"
#include "config.hh"
@ -17,5 +16,3 @@ vector< sptr< Dictionary::Class > >
makeDictionaries( Config::SoundDirs const &, string const & indicesDir, Dictionary::Initializing & );
} // namespace SoundDir
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __SOURCES_HH_INCLUDED__
#define __SOURCES_HH_INCLUDED__
#pragma once
#include "ui_sources.h"
#include "config.hh"
@ -360,5 +359,3 @@ private slots:
void on_rescan_clicked();
};
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __STARTDICT_HH_INCLUDED__
#define __STARTDICT_HH_INCLUDED__
#pragma once
#include "dictionary.hh"
@ -18,5 +17,3 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
unsigned maxHeadwordsToExpand );
} // namespace Stardict
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __TRANSLITERATION_HH_INCLUDED__
#define __TRANSLITERATION_HH_INCLUDED__
#pragma once
#include "dictionary.hh"
#include <map>
@ -84,5 +83,3 @@ public:
};
} // namespace Transliteration
#endif

View file

@ -1,5 +1,4 @@
#ifndef __DECOMPRESS_HH_INCLUDED__
#define __DECOMPRESS_HH_INCLUDED__
#pragma once
#include <QByteArray>
#include <string>
@ -13,5 +12,3 @@ string decompressZlib( const char * bufptr, unsigned length );
string decompressBzip2( const char * bufptr, unsigned length );
string decompressLzma2( const char * bufptr, unsigned length, bool raw_decoder = false );
#endif // DECOMPRESS_HH

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef GOLDENDICT_FILE_HH
#define GOLDENDICT_FILE_HH
#pragma once
#include "ex.hh"
@ -125,5 +124,3 @@ private:
};
} // namespace File
#endif

View file

@ -21,8 +21,7 @@
* 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
*/
#ifndef _DICTZIP_H_
#define _DICTZIP_H_
#pragma once
#include <stdio.h>
#include <zlib.h>
@ -112,5 +111,3 @@ extern int mmap_mode;
#ifdef __cplusplus
} /* end extern "C" */
#endif
#endif /* _DICTZIP_H_ */

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __INDEXEDZIP_HH_INCLUDED__
#define __INDEXEDZIP_HH_INCLUDED__
#pragma once
#include "btreeidx.hh"
#include <QFile>
@ -48,5 +47,3 @@ public:
/// Index compressed files in zip file
bool indexFile( BtreeIndexing::IndexedWords & zipFileNames, quint32 * filesCount = 0 );
};
#endif

View file

@ -16,8 +16,7 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
#ifndef __RIPEMD_HH_INCLUDED__
#define __RIPEMD_HH_INCLUDED__
#pragma once
#include <stddef.h>
#include <QtGlobal>
@ -42,5 +41,3 @@ private:
void transform( const uchar buffer[ 64 ] );
};
#endif // __RIPEMD_HH_INCLUDED__

View file

@ -1,5 +1,4 @@
#ifndef __SPLITFILE_HH_INCLUDED__
#define __SPLITFILE_HH_INCLUDED__
#pragma once
#include <QFile>
#include <QList>
@ -51,5 +50,3 @@ public:
};
} // namespace SplitFile
#endif // __SPLITFILE_HH_INCLUDED__

View file

@ -1,5 +1,4 @@
#ifndef UFILE_HH_INCLUDED
#define UFILE_HH_INCLUDED
#pragma once
// Don't use this thing.
// Use QFile instead.
@ -29,5 +28,3 @@ gzFile gd_gzopen( const char * filename );
#define gd_fopen fopen
#define gd_gzopen( filename ) gzopen( filename, "rb" )
#endif
#endif // UFILE_HH

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __ZIPFILE_HH_INCLUDED__
#define __ZIPFILE_HH_INCLUDED__
#pragma once
#include <QFile>
#include <QDateTime>
@ -72,5 +71,3 @@ bool readNextEntry( SplitZipFile &, CentralDirEntry & );
bool readLocalHeader( SplitZipFile &, LocalFileHeader & );
} // namespace ZipFile
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __WEBSITE_HH_INCLUDED__
#define __WEBSITE_HH_INCLUDED__
#pragma once
#include "dictionary.hh"
#include "config.hh"
@ -17,5 +16,3 @@ vector< sptr< Dictionary::Class > > makeDictionaries( Config::WebSites const &,
} // namespace WebSite
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2009 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __XDXF_HH_INCLUDED__
#define __XDXF_HH_INCLUDED__
#pragma once
#include "dictionary.hh"
@ -18,5 +17,3 @@ vector< sptr< Dictionary::Class > >
makeDictionaries( vector< string > const & fileNames, string const & indicesDir, Dictionary::Initializing & );
} // namespace Xdxf
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __XDXF2HTML_HH_INCLUDED__
#define __XDXF2HTML_HH_INCLUDED__
#pragma once
#include <string>
#include <map>
@ -32,5 +31,3 @@ string convert( string const &,
QString * headword = 0 );
} // namespace Xdxf2Html
#endif

View file

@ -1,5 +1,4 @@
#ifndef __ZIM_HH_INCLUDED__
#define __ZIM_HH_INCLUDED__
#pragma once
#ifdef MAKE_ZIM_SUPPORT
@ -19,5 +18,3 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
} // namespace Zim
#endif
#endif

View file

@ -1,7 +1,6 @@
/* This file is part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef ZIPSOUNDS_HH
#define ZIPSOUNDS_HH
#pragma once
#include "dictionary.hh"
@ -15,5 +14,3 @@ vector< sptr< Dictionary::Class > >
makeDictionaries( vector< string > const & fileNames, string const & indicesDir, Dictionary::Initializing & );
} // namespace ZipSounds
#endif // ZIPSOUNDS_HH

View file

@ -1,7 +1,6 @@
/* Licensed under GPLv3 or later, see the LICENSE file */
#ifndef DICTIONARYGROUP_HH_INCLUDED
#define DICTIONARYGROUP_HH_INCLUDED
#pragma once
#include "sptr.hh"
#include "dict/dictionary.hh"
@ -30,5 +29,3 @@ private:
std::vector< sptr< Dictionary::Class > > const & allDictionaries;
Instances::Groups const & groups;
};
#endif // DICTIONARYGROUP_HH_INCLUDED

View file

@ -1,8 +1,7 @@
/* This file is (c) 2018 Igor Kushnir <igorkuo@gmail.com>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef EXTERNALAUDIOPLAYER_HH_INCLUDED
#define EXTERNALAUDIOPLAYER_HH_INCLUDED
#pragma once
#include "audioplayerinterface.hh"
#include <memory>
@ -44,5 +43,3 @@ private:
// deleteLater() is safer because viewer actively participates in the QEventLoop.
std::unique_ptr< ExternalViewer, QObjectDeleteLater > viewer;
};
#endif // EXTERNALAUDIOPLAYER_HH_INCLUDED

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __EXTERNALVIEWER_HH_INCLUDED__
#define __EXTERNALVIEWER_HH_INCLUDED__
#pragma once
#include <QObject>
#include <QTemporaryFile>
@ -44,5 +43,3 @@ public:
/// Call this function instead of simply deleting viewer to prevent the
/// "QProcess: Destroyed while process X is still running." warning in log.
void stopAndDestroySynchronously( ExternalViewer * viewer );
#endif

View file

@ -1,5 +1,4 @@
#ifndef __FFMPEGAUDIO_HH_INCLUDED__
#define __FFMPEGAUDIO_HH_INCLUDED__
#pragma once
#ifdef MAKE_FFMPEG_PLAYER
#include "audiooutput.hh"
@ -106,5 +105,3 @@ signals:
} // namespace Ffmpeg
#endif // MAKE_FFMPEG_PLAYER
#endif // __FFMPEGAUDIO_HH_INCLUDED__

View file

@ -1,8 +1,7 @@
/* This file is (c) 2018 Igor Kushnir <igorkuo@gmail.com>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef FFMPEGAUDIOPLAYER_HH_INCLUDED
#define FFMPEGAUDIOPLAYER_HH_INCLUDED
#pragma once
#include "audioplayerinterface.hh"
#include "ffmpegaudio.hh"
@ -41,5 +40,3 @@ public:
} // namespace Ffmpeg
#endif // MAKE_FFMPEG_PLAYER
#endif // FFMPEGAUDIOPLAYER_HH_INCLUDED

View file

@ -1,5 +1,4 @@
#ifndef __FTSHELPERS_HH_INCLUDED__
#define __FTSHELPERS_HH_INCLUDED__
#pragma once
#include <QString>
#include <QList>
@ -71,5 +70,3 @@ public:
};
} // namespace FtsHelpers
#endif // __FTSHELPERS_HH_INCLUDED__

View file

@ -1,5 +1,4 @@
#ifndef __FULLTEXTSEARCH_HH_INCLUDED__
#define __FULLTEXTSEARCH_HH_INCLUDED__
#pragma once
#include <QAbstractListModel>
#include <QAction>
@ -261,5 +260,3 @@ signals:
} // namespace FTS
#endif // __FULLTEXTSEARCH_HH_INCLUDED__

View file

@ -1,5 +1,4 @@
#ifndef HEADWORDSMODEL_H
#define HEADWORDSMODEL_H
#pragma once
#include "dict/dictionary.hh"
@ -53,5 +52,3 @@ private:
QMutex lock;
std::list< sptr< Dictionary::WordSearchRequest > > queuedRequests;
};
#endif // HEADWORDSMODEL_H

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __HISTORY_HH_INCLUDED__
#define __HISTORY_HH_INCLUDED__
#pragma once
#include <QObject>
#include <QList>
@ -114,5 +113,3 @@ private:
protected:
virtual void timerEvent( QTimerEvent * );
};
#endif

View file

@ -1,5 +1,4 @@
#ifndef HOTKEYWRAPPER_H
#define HOTKEYWRAPPER_H
#pragma once
#include <QGuiApplication>
#include <QThread>
@ -221,5 +220,3 @@ protected:
};
//////////////////////////////////////////////////////////////////////////
#endif // HOTKEYWRAPPER_H

View file

@ -1,5 +1,4 @@
#ifndef IFRAMESCHEMEHANDLER_H
#define IFRAMESCHEMEHANDLER_H
#pragma once
#include "article_netmgr.hh"
@ -16,5 +15,3 @@ protected:
private:
QNetworkAccessManager mgr;
};
#endif // IFRAMESCHEMEHANDLER_H

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __INITIALIZING_HH_INCLUDED__
#define __INITIALIZING_HH_INCLUDED__
#pragma once
#include "ui_initializing.h"
@ -26,5 +25,3 @@ private:
Ui::Initializing ui;
};
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __INSTANCES_HH_INCLUDED__
#define __INSTANCES_HH_INCLUDED__
#pragma once
#include "config.hh"
#include "dict/dictionary.hh"
@ -79,5 +78,3 @@ void updateNames( Config::Class &, vector< sptr< Dictionary::Class > > const & a
QIcon iconFromData( QByteArray const & );
} // namespace Instances
#endif

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __KEYBOARDSTATE_HH_INCLUDED__
#define __KEYBOARDSTATE_HH_INCLUDED__
#pragma once
/// Since Qt doesn't provide a way to test for keyboard modifiers state
/// when the app isn't in focus, we have to implement this separately for
@ -22,5 +21,3 @@ public:
/// right now.
bool static checkModifiersPressed( int mask );
};
#endif

View file

@ -1,5 +1,4 @@
#ifndef LANGCODER_H
#define LANGCODER_H
#pragma once
#include <QString>
#include <QIcon>
@ -59,6 +58,3 @@ private:
///////////////////////////////////////////////////////////////////////////////
#define LangCodeRole Qt::UserRole
#endif // LANGCODER_H

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef __LANGUAGE_HH_INCLUDED__
#define __LANGUAGE_HH_INCLUDED__
#pragma once
#include <QString>
#include "wstring_qt.hh"
@ -50,5 +49,3 @@ struct BabylonLang
BabylonLang getBabylonLangByIndex( int index );
quint32 findBlgLangIDByEnglishName( gd::wstring const & lang );
} // namespace Language
#endif

View file

@ -1,15 +1,14 @@
#ifdef __APPLE__
#ifndef __MACMOUSEOVER_HH_INCLUDED__
#define __MACMOUSEOVER_HH_INCLUDED__
#pragma once
#include <QObject>
#include <QTimer>
#include <ApplicationServices/ApplicationServices.h>
#include "config.hh"
#include "keyboardstate.hh"
#include <QMutexLocker>
#include <QMutex>
#include <QObject>
#include <QTimer>
#include <ApplicationServices/ApplicationServices.h>
#include "config.hh"
#include "keyboardstate.hh"
#include <QMutexLocker>
#include <QMutex>
/// This is a mouseover feature interface, where you can point your mouse at
/// any word in any window and wait a little, and it would provide that word
@ -66,6 +65,4 @@ private:
bool mouseOverEnabled;
};
#endif
#endif

View file

@ -564,18 +564,35 @@ int main( int argc, char ** argv )
QLocale::setDefault( locale );
QApplication::setLayoutDirection( locale.textDirection() );
if ( !qtTranslator.load( "qt_extra_" + localeName, Config::getLocDir() ) ) {
qtTranslator.load( "qt_extra_" + localeName, QLibraryInfo::location( QLibraryInfo::TranslationsPath ) );
// Load Qt translators
// For Windows, windeployqt will combine multiple qt modules translations into `qt_*`
// Thus, after deployment, loading `qtwebengine_*` is guaranteed to fail on Windows.
if ( qtTranslator.load( locale, "qt", "_", QLibraryInfo::path( QLibraryInfo::TranslationsPath ) ) ) {
app.installTranslator( &qtTranslator );
qDebug() << "qt translator loaded: " << qtTranslator.filePath();
}
else {
qDebug() << "qt translator didn't load anything.";
}
translator.load( Config::getLocDir() + "/" + localeName );
app.installTranslator( &translator );
QTranslator webengineTs;
if ( webengineTs.load( "qtwebengine_" + localeName, Config::getLocDir() ) ) {
if ( webengineTs.load( locale, "qtwebengine", "_", QLibraryInfo::path( QLibraryInfo::TranslationsPath ) ) ) {
app.installTranslator( &webengineTs );
qDebug() << "qt webengine translator loaded: " << webengineTs.filePath();
}
else {
qDebug() << "qt webengine translator may or may not be loaded.";
}
// Load GD's translations, note GD has local names beyond what's supported by QLocal
if ( translator.load( localeName, Config::getLocDir() ) ) {
app.installTranslator( &translator );
qDebug() << "gd translator loaded: " << translator.filePath();
}
else {
qDebug() << "gd translator didn't load anything";
}
// Prevent app from quitting spontaneously when it works with popup
// and with the main window closed.

View file

@ -1,8 +1,7 @@
/* This file is (c) 2018 Igor Kushnir <igorkuo@gmail.com>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef MULTIMEDIAAUDIOPLAYER_HH_INCLUDED
#define MULTIMEDIAAUDIOPLAYER_HH_INCLUDED
#pragma once
#ifdef MAKE_QTMULTIMEDIA_PLAYER
@ -44,5 +43,3 @@ private:
};
#endif // MAKE_QTMULTIMEDIA_PLAYER
#endif // MULTIMEDIAAUDIOPLAYER_HH_INCLUDED

View file

@ -1,5 +1,4 @@
#ifndef PRONOUNCEENGINE_HH
#define PRONOUNCEENGINE_HH
#pragma once
#include <QObject>
#include <QMap>
@ -27,5 +26,3 @@ public:
signals:
void emitAudio( QString audioLink );
};
#endif // PRONOUNCEENGINE_HH

View file

@ -1,5 +1,4 @@
#ifndef RESOURCESCHEMEHANDLER_H
#define RESOURCESCHEMEHANDLER_H
#pragma once
#include "article_netmgr.hh"
@ -18,5 +17,3 @@ private:
ArticleNetworkAccessManager & mManager;
QMimeDatabase db;
};
#endif // RESOURCESCHEMEHANDLER_H

View file

@ -1,8 +1,7 @@
/* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
* Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
#ifndef TERMINATION_HH
#define TERMINATION_HH
#pragma once
#include <QFile>
@ -11,5 +10,3 @@ extern QFile * logFilePtr;
// Installs the termination handler which attempts to pop Qt's dialog showing
// the exception and backtrace, and then aborts.
void installTerminationHandler();
#endif // TERMINATION_HH

Some files were not shown because too many files have changed in this diff Show more