Removed files because of conflict when merging the "younes" branch

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14233 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/Application.h b/src/frontends/qt4/Application.h
deleted file mode 100644 (file)
index 0d43572..0000000
--- a/src/frontends/qt4/Application.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * \file qt4/Application.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author unknown
- * \author John Levon
- * \author Abdelrazak Younes
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#ifndef LYX_APPLICATION_H
-#define LYX_APPLICATION_H
-
-#include <QApplication>
-
-///////////////////////////////////////////////////////////////
-// Specific stuff
-
-#ifdef Q_WS_MACX
-#include <Carbon/Carbon.h>
-#endif
-///////////////////////////////////////////////////////////////
-
-namespace lyx {
-namespace frontend {
-
-class GuiWorkArea;
-
-/// The Qt main application class
-/**
-There should be only one instance of this class. No Qt object
-initialisation should be done before the instanciation of this class.
-
-\todo The work areas handling could be moved to a base virtual class
-comon to all frontends.
-*/
-class Application : public QApplication
-{
-public:
-       Application(int & argc, char ** argv);
-
-       void connect(GuiWorkArea * work_area);
-
-private:
-       ///
-       GuiWorkArea * work_area_;
-
-#ifdef Q_WS_X11
-public:
-       bool x11EventFilter (XEvent * ev);
-#endif
-
-#ifdef Q_WS_MACX
-public:
-       bool macEventFilter(EventRef event);
-private:
-//     static OSStatus handleOpenDocuments(
-       static pascal OSErr     handleOpenDocuments(
-               const AppleEvent* inEvent, AppleEvent*, long);
-#endif
-}; // Application
-
-} // namespace frontend
-} // namespace lyx
-
-#endif // LYX_APPLICATION_H

diff --git a/src/frontends/qt4/GuiClipboard.C b/src/frontends/qt4/GuiClipboard.C
deleted file mode 100644 (file)
index 6f0238a..0000000
--- a/src/frontends/qt4/GuiClipboard.C
+++ /dev/null
@@ -1,75 +0,0 @@
-// -*- C++ -*-
-/**
- * \file GuiClipboard.C
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author John Levon
- * \author Abdelrazak Younes
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#include "GuiClipboard.h"
-#include "qt_helpers.h"
-
-#include "debug.h"
-
-#include <QApplication>
-#include <QClipboard>
-#include <QString>
-
-#include <string>
-
-#include "support/lstrings.h"
-using lyx::support::internalLineEnding;
-using lyx::support::externalLineEnding;
-
-using std::endl;
-using std::string;
-
-namespace lyx {
-namespace frontend {
-
-#ifdef Q_WS_X11
-QClipboard::Mode const CLIPBOARD_MODE = QClipboard::Selection;
-#else
-// FIXME external clipboard support is mostly broken for windows
-// because the following fixe would involves too much side effects WRT mouse selection.
-//QClipboard::Mode const CLIPBOARD_MODE = QClipboard::Clipboard;
-QClipboard::Mode const CLIPBOARD_MODE = QClipboard::Selection;
-#endif
-
-void GuiClipboard::haveSelection(bool own)
-{
-       if (!qApp->clipboard()->supportsSelection())
-               return;
-
-       if (own) {
-               qApp->clipboard()->setText(QString(), CLIPBOARD_MODE);
-       }
-       // We don't need to do anything if own = false, as this case is
-       // handled by QT.
-}
-
-
-string const GuiClipboard::get() const
-{
-       QString str = qApp->clipboard()->text(CLIPBOARD_MODE);
-       lyxerr[Debug::ACTION] << "getClipboard: " << (const char*) str << endl;
-       if (str.isNull())
-               return string();
-
-       return internalLineEnding(fromqstr(str));
-}
-
-
-void GuiClipboard::put(string const & str)
-{
-       lyxerr[Debug::ACTION] << "putClipboard: " << str << endl;
-
-       qApp->clipboard()->setText(toqstr(externalLineEnding(str)), CLIPBOARD_MODE);
-}
-
-} // namespace frontend
-} // namespace lyx