configdialog.cpp | 2 +- latexeditor.h | 2 +- latexeditorview.h | 2 +- latexhighlighter.h | 2 +- spellerdialog.h | 2 +- texmaker.h | 2 +- texmaker.pro | 36 +++--------------------------------- 7 files changed, 9 insertions(+), 39 deletions(-) diff --git a/configdialog.cpp b/configdialog.cpp index ef30bd4..1acc9d1 100644 --- a/configdialog.cpp +++ b/configdialog.cpp @@ -122,7 +122,7 @@ void ConfigDialog::browseAspell() QDir spelldir(QCoreApplication::applicationDirPath()); #else #ifdef DEBIAN_SPELLDIR -QDir spelldir(PREFIX"/share/myspell/dicts"); +QDir spelldir(PREFIX"/share/myspell"); #else QDir spelldir(PREFIX"/share/texmaker"); #endif diff --git a/latexeditor.h b/latexeditor.h index b79df23..b482a9a 100644 --- a/latexeditor.h +++ b/latexeditor.h @@ -26,7 +26,7 @@ #include #include "latexhighlighter.h" -#include "hunspell/hunspell.hxx" +#include typedef int UserBookmarkList[3]; diff --git a/latexeditorview.h b/latexeditorview.h index 0471d6f..f663fdf 100644 --- a/latexeditorview.h +++ b/latexeditorview.h @@ -19,7 +19,7 @@ #include "linenumberwidget.h" #include "findwidget.h" #include "minisplitter.h" -#include "hunspell/hunspell.hxx" +#include class LatexEditorView : public QWidget { Q_OBJECT diff --git a/latexhighlighter.h b/latexhighlighter.h index 83ca79c..a1e437a 100644 --- a/latexhighlighter.h +++ b/latexhighlighter.h @@ -20,7 +20,7 @@ #include #include //#include "latexeditor.h" -#include "hunspell/hunspell.hxx" +#include class QTextDocument; class LatexEditor; diff --git a/spellerdialog.h b/spellerdialog.h index 83248ae..cd16dad 100644 --- a/spellerdialog.h +++ b/spellerdialog.h @@ -13,7 +13,7 @@ #include "ui_spellerdialog.h" #include "latexeditor.h" -#include "hunspell/hunspell.hxx" +#include #include diff --git a/texmaker.h b/texmaker.h index 66d7967..f8e4b57 100644 --- a/texmaker.h +++ b/texmaker.h @@ -47,7 +47,7 @@ #include "logeditor.h" #include "gotolinedialog.h" #include "replacedialog.h" -#include "hunspell/hunspell.hxx" +#include #include "browser.h" #include "pdfviewerwidget.h" #include "pdfviewer.h" diff --git a/texmaker.pro b/texmaker.pro index 9078988..fb42191 100644 --- a/texmaker.pro +++ b/texmaker.pro @@ -4,7 +4,8 @@ TARGET = texmaker QT += network \ xml \ webkit -CONFIG += qt warn_off release +CONFIG += qt warn_off release link_pkgconfig +PKGCONFIG = hunspell TEXMAKERVERSION=3.0 DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\" DEFINES += HAVE_SPLASH @@ -56,25 +57,6 @@ HEADERS += texmaker.h \ usercompletiondialog.h \ synctex_parser.h \ synctex_parser_utils.h \ - hunspell/affentry.hxx \ - hunspell/affixmgr.hxx \ - hunspell/atypes.hxx \ - hunspell/baseaffix.hxx \ - hunspell/csutil.hxx \ - hunspell/dictmgr.hxx \ - hunspell/hashmgr.hxx \ - hunspell/htypes.hxx \ - hunspell/hunspell.hxx \ - hunspell/hunspell.h \ - hunspell/langnum.hxx \ - hunspell/license.hunspell \ - hunspell/phonet.hxx \ - hunspell/suggestmgr.hxx \ - hunspell/license.myspell \ - hunspell/filemgr.hxx \ - hunspell/hunzip.hxx \ - hunspell/replist.hxx \ - hunspell/w_char.hxx \ singleapp/qtlocalpeer.h \ singleapp/qtlockedfile.h \ singleapp/qtsingleapplication.h \ @@ -150,18 +132,6 @@ SOURCES += main.cpp \ usercompletiondialog.cpp \ synctex_parser.c \ synctex_parser_utils.c \ - hunspell/affentry.cxx \ - hunspell/affixmgr.cxx \ - hunspell/csutil.cxx \ - hunspell/dictmgr.cxx \ - hunspell/hashmgr.cxx \ - hunspell/hunspell.cxx \ - hunspell/phonet.cxx \ - hunspell/suggestmgr.cxx \ - hunspell/utf_info.cxx \ - hunspell/filemgr.cxx \ - hunspell/replist.cxx \ - hunspell/hunzip.cxx \ singleapp/qtlocalpeer.cpp \ singleapp/qtlockedfile.cpp \ singleapp/qtsingleapplication.cpp \ @@ -253,7 +223,7 @@ LIBS += -L/usr/lib -lz DEFINES += PREFIX=\\\"$${PREFIX}\\\" target.path = $${PREFIX}/bin -#DEFINES += DEBIAN_SPELLDIR +DEFINES += DEBIAN_SPELLDIR INSTALLS = target HEADERS += x11fontdialog.h