Commit 4ce837a7 authored by Frederik Gladhorn's avatar Frederik Gladhorn
Browse files

Qt5 porting

parent 4851e8a7
......@@ -18,14 +18,14 @@
#include <knuminput.h>
#include <kpushbutton.h>
#include <QtGui/QApplication>
#include <QtGui/QHBoxLayout>
#include <QtGui/QVBoxLayout>
#include <QtGui/QGroupBox>
#include <QtWidgets/QApplication>
#include <QtWidgets/QHBoxLayout>
#include <QtWidgets/QVBoxLayout>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QLabel>
#include <QtGui/QListWidget>
#include <QtGui/QListWidgetItem>
#include <QtGui/QStackedWidget>
#include <QtWidgets/QListWidget>
#include <QtWidgets/QListWidgetItem>
#include <QtWidgets/QStackedWidget>
#include <QtXml/QDomDocument>
#include <QtXml/QDomElement>
......
......@@ -16,9 +16,10 @@ set( okularGenerator_comicbook_PART_SRCS
kde4_add_plugin(okularGenerator_comicbook ${okularGenerator_comicbook_PART_SRCS})
target_link_libraries(okularGenerator_comicbook okularcore ${KDE4_KIO_LIBS} )
target_link_libraries(okularGenerator_comicbook okularcore KF5::KIOCore)
if (UNIX)
target_link_libraries(okularGenerator_comicbook ${KDE4_KPTY_LIBRARY})
find_package(KF5 REQUIRED Pty)
target_link_libraries(okularGenerator_comicbook KF5::Pty )
endif (UNIX)
install(TARGETS okularGenerator_comicbook DESTINATION ${PLUGIN_INSTALL_DIR})
......
......@@ -20,8 +20,8 @@
#include <kstandarddirs.h>
#include <ktempdir.h>
#if !defined(Q_OS_WIN)
#include <kptyprocess.h>
#include <kptydevice.h>
#include <KPty/kptyprocess.h>
#include <KPty/kptydevice.h>
#endif
#include "unrarflavours.h"
......
......@@ -24,7 +24,7 @@
#include <QtGui/QTextDocument>
#include <QtGui/QTextFrame>
#include <QtGui/QLabel>
#include <QtWidgets/QLabel>
#include <core/action.h>
#include <core/document.h>
......
......@@ -17,15 +17,14 @@
static KAboutData createAboutData()
{
KAboutData aboutData(
"okular_txt",
"okular_txt",
ki18n( "Txt Backend" ),
"0.1",
ki18n( "Txt backend." ),
KAboutData::License_GPL,
ki18n( "© 2013 Azat Khuzhin" )
QStringLiteral("okular_txt"),
i18n( "Txt Backend" ),
QStringLiteral("0.1"),
i18n( "Txt backend." ),
KAboutLicense::GPL,
i18n( "© 2013 Azat Khuzhin" )
);
aboutData.addAuthor( ki18n( "Azat Khuzhin" ), KLocalizedString(), "a3at.mail@gmail.com" );
aboutData.addAuthor( QStringLiteral( "Azat Khuzhin" ), QString(), QStringLiteral("a3at.mail@gmail.com") );
return aboutData;
}
......
......@@ -30,7 +30,7 @@
#include <qlabel.h>
#include <qtimer.h>
#include <QtPrintSupport/QPrinter>
#include <QtGui/QPrintDialog>
#include <QtPrintSupport/QPrintDialog>
#include <QScrollBar>
#include <kvbox.h>
......@@ -66,6 +66,7 @@
#include <kbookmarkmenu.h>
#include <kpassworddialog.h>
#include <kwallet.h>
#include <kdeversion.h>
// local includes
#include "aboutdata.h"
......@@ -155,7 +156,7 @@ class FileKeeper
};
Okular::PartFactory::PartFactory()
: KPluginFactory(okularAboutData( "okular", I18N_NOOP( "Okular" ) ))
: KPluginFactory(okularAboutData())
{
}
......
......@@ -23,6 +23,7 @@
#include <qlist.h>
#include <qpointer.h>
#include <qprocess.h>
#include <kurl.h>
#include "core/observer.h"
#include "core/document.h"
#include "kdocumentviewer.h"
......
......@@ -11,6 +11,7 @@
#include <klocale.h>
#include <kmenu.h>
#include <kicon.h>
#include "annotationpropertiesdialog.h"
......
......@@ -10,7 +10,7 @@
#include "annotationproxymodels.h"
#include <QtCore/QList>
#include <QtGui/QItemSelection>
#include <QtCore/QItemSelection>
#include <kicon.h>
......@@ -127,7 +127,7 @@ QModelIndex PageGroupProxyModel::index( int row, int column, const QModelIndex &
return QModelIndex();
} else {
if ( row < mTreeIndexes.count() )
return createIndex( row, column, 0 );
return createIndex( row, column );
else
return QModelIndex();
}
......
......@@ -10,7 +10,7 @@
#ifndef ANNOTATIONPROXYMODEL_H
#define ANNOTATIONPROXYMODEL_H
#include <QtGui/QSortFilterProxyModel>
#include <QtCore/QSortFilterProxyModel>
#include <QtCore/QPair>
/**
......
......@@ -19,11 +19,12 @@
#include <QtGui/QShowEvent>
#include <kmimetypetrader.h>
#include <kparts/part.h>
#include <kparts/readonlypart.h>
#include <kpluginfactory.h>
#include <kpluginloader.h>
#include <kpushbutton.h>
#include <kservice.h>
#include <ksharedconfig.h>
#include <kdebug.h>
using namespace Okular;
......
......@@ -24,14 +24,14 @@
#include <QtCore/QList>
#include <QtCore/QTimer>
#include <QtCore/QRegExp>
#include <QtGui/QApplication>
#include <QtWidgets/QApplication>
#include <QtGui/QContextMenuEvent>
#include <QtGui/QHBoxLayout>
#include <QtGui/QHeaderView>
#include <QtWidgets/QHBoxLayout>
#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtGui/QMenu>
#include <QtGui/QToolButton>
#include <QtGui/QTreeView>
#include <QtWidgets/QMenu>
#include <QtWidgets/QToolButton>
#include <QtWidgets/QTreeView>
#include <kdebug.h>
#include <kiconloader.h>
......
......@@ -19,7 +19,7 @@
#include <qlayout.h>
#include <QStyleOptionButton>
#include <QStylePainter>
#include <QtGui/QToolButton>
#include <QtWidgets/QToolButton>
#include <qvalidator.h>
#include <qpainter.h>
#include <kicon.h>
......
......@@ -11,14 +11,14 @@
// qt/kde includes
#include <QtCore/QStringList>
#include <QtGui/QHeaderView>
#include <QtGui/QLayout>
#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLayout>
#include <QtGui/QPaintEvent>
#include <QtGui/QPainter>
#include <QtGui/QSizePolicy>
#include <QtWidgets/QSizePolicy>
#include <QtGui/QTextDocument>
#include <QtGui/QToolBar>
#include <QtGui/QTreeView>
#include <QtWidgets/QToolBar>
#include <QtWidgets/QTreeView>
#include <kaction.h>
#include <klocale.h>
......
......@@ -12,7 +12,7 @@
#include <QtCore/QModelIndexList>
#include <QtCore/QVector>
#include <QtGui/QWidget>
#include <QtWidgets/QWidget>
#include "core/observer.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment