[Libreoffice-commits] core.git: Branch 'feature/qt5+kde5' - vcl/unx
Katarina Behrens
Katarina.Behrens at cib.de
Fri Apr 13 09:34:34 UTC 2018
vcl/unx/kde5/KDE5SalInstance.cxx | 6 ------
vcl/unx/kde5/KDE5SalInstance.hxx | 1 -
2 files changed, 7 deletions(-)
New commits:
commit 8c1d2df66aadcecb9add585307a4cad2fa3d19e1
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Fri Apr 13 11:32:44 2018 +0200
Remove unused headers and commented-out code
Change-Id: I8dee846d9499f1549f5e61deaad885b93d2f5438
diff --git a/vcl/unx/kde5/KDE5SalInstance.cxx b/vcl/unx/kde5/KDE5SalInstance.cxx
index b5ce3f812c72..dcf167312a75 100644
--- a/vcl/unx/kde5/KDE5SalInstance.cxx
+++ b/vcl/unx/kde5/KDE5SalInstance.cxx
@@ -23,7 +23,6 @@
#include <QtWidgets/QApplication>
#include <QtGui/QClipboard>
#include <QtWidgets/QFrame>
-#include <QtX11Extras/QX11Info>
#include <osl/process.h>
#include <qt5/Qt5Data.hxx>
@@ -59,11 +58,6 @@ uno::Reference< ui::dialogs::XFilePicker2 > KDE5SalInstance::createFilePicker(
return SalInstance::createFilePicker( xMSF );
}
-/*SalX11Display* KDE5SalInstance::CreateDisplay() const
-{
- return new SalKDE5Display( QX11Info::display() );
-}*/
-
bool KDE5SalInstance::IsMainThread() const
{
return qApp->thread() == QThread::currentThread();
diff --git a/vcl/unx/kde5/KDE5SalInstance.hxx b/vcl/unx/kde5/KDE5SalInstance.hxx
index 7b549a18c08d..45a20e6cfaa2 100644
--- a/vcl/unx/kde5/KDE5SalInstance.hxx
+++ b/vcl/unx/kde5/KDE5SalInstance.hxx
@@ -19,7 +19,6 @@
#pragma once
-#include <headless/svpinst.hxx>
#include <qt5/Qt5Instance.hxx>
#include "KDE5SalFrame.hxx"
More information about the Libreoffice-commits
mailing list