From 7bfbeee612454a6effeae49b23c8a1d742fa7774 Mon Sep 17 00:00:00 2001 From: Abdelrazak Younes Date: Thu, 7 Feb 2008 00:05:18 +0000 Subject: [PATCH] Transfer FileDialog.h to qt4/ git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22821 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/Makefile.am | 1 - src/frontends/qt4/FileDialog.cpp | 2 +- src/frontends/{ => qt4}/FileDialog.h | 0 src/frontends/qt4/GuiClipboard.cpp | 21 +++++++++++---------- src/frontends/qt4/GuiView.cpp | 2 +- src/frontends/qt4/LyXFileDialog.h | 2 +- src/frontends/qt4/Makefile.am | 1 + src/frontends/qt4/qt_helpers.cpp | 2 +- 8 files changed, 16 insertions(+), 15 deletions(-) rename src/frontends/{ => qt4}/FileDialog.h (100%) diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am index cb17040b12..adda793d94 100644 --- a/src/frontends/Makefile.am +++ b/src/frontends/Makefile.am @@ -13,7 +13,6 @@ liblyxfrontends_la_SOURCES = \ Application.h \ NoGuiFontLoader.h \ NoGuiFontMetrics.h \ - FileDialog.h \ FontLoader.h \ FontMetrics.h \ KeyModifier.h \ diff --git a/src/frontends/qt4/FileDialog.cpp b/src/frontends/qt4/FileDialog.cpp index eb956cdf37..50d98c59eb 100644 --- a/src/frontends/qt4/FileDialog.cpp +++ b/src/frontends/qt4/FileDialog.cpp @@ -11,7 +11,7 @@ #include -#include "frontends/FileDialog.h" +#include "FileDialog.h" #include "LyXFileDialog.h" #include "qt_helpers.h" diff --git a/src/frontends/FileDialog.h b/src/frontends/qt4/FileDialog.h similarity index 100% rename from src/frontends/FileDialog.h rename to src/frontends/qt4/FileDialog.h diff --git a/src/frontends/qt4/GuiClipboard.cpp b/src/frontends/qt4/GuiClipboard.cpp index 4b056ec018..4a05c6bba0 100644 --- a/src/frontends/qt4/GuiClipboard.cpp +++ b/src/frontends/qt4/GuiClipboard.cpp @@ -12,13 +12,22 @@ #include +#include "FileDialog.h" + +#include "frontends/alert.h" + #include "Buffer.h" #include "BufferView.h" #include "Cursor.h" #include "GuiClipboard.h" #include "qt_helpers.h" -#include "boost/assert.hpp" +#include "support/convert.h" +#include "support/debug.h" +#include "support/filetools.h" +#include "support/FileFilterList.h" +#include "support/gettext.h" +#include "support/lstrings.h" #include #include @@ -31,15 +40,7 @@ #include #include -#include "support/convert.h" -#include "support/debug.h" -#include "support/filetools.h" -#include "support/FileFilterList.h" -#include "support/gettext.h" -#include "support/lstrings.h" - -#include "frontends/alert.h" -#include "frontends/FileDialog.h" +#include "boost/assert.hpp" #include diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 2789220d97..62d4905fac 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -16,7 +16,7 @@ #include "GuiView.h" #include "Dialog.h" -#include "frontends/FileDialog.h" +#include "FileDialog.h" #include "GuiApplication.h" #include "GuiWorkArea.h" #include "GuiKeySymbol.h" diff --git a/src/frontends/qt4/LyXFileDialog.h b/src/frontends/qt4/LyXFileDialog.h index 66e22a9758..f04bfe4590 100644 --- a/src/frontends/qt4/LyXFileDialog.h +++ b/src/frontends/qt4/LyXFileDialog.h @@ -12,7 +12,7 @@ #ifndef LYXFILEDIALOG_H #define LYXFILEDIALOG_H -#include "frontends/FileDialog.h" +#include "FileDialog.h" #include diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am index 7a78757000..576ce535bb 100644 --- a/src/frontends/qt4/Makefile.am +++ b/src/frontends/qt4/Makefile.am @@ -136,6 +136,7 @@ SOURCEFILES = \ NOMOCHEADER = \ ButtonController.h \ + FileDialog.h \ GuiFontLoader.h \ GuiFontMetrics.h \ GuiImage.h \ diff --git a/src/frontends/qt4/qt_helpers.cpp b/src/frontends/qt4/qt_helpers.cpp index 3b09d9a941..9072b81fb0 100644 --- a/src/frontends/qt4/qt_helpers.cpp +++ b/src/frontends/qt4/qt_helpers.cpp @@ -14,6 +14,7 @@ #include "qt_helpers.h" +#include "FileDialog.h" #include "LengthCombo.h" #include "support/debug.h" @@ -21,7 +22,6 @@ #include "Language.h" #include "Length.h" -#include "frontends/FileDialog.h" #include "frontends/alert.h" #include "support/filetools.h" -- 2.39.5