Commit 00821257 authored by Jan Grulich's avatar Jan Grulich
Browse files

Rename archive.h to archive_kerfuffle.h

This fixes build of libarchiveplugin, where we need to compile against libarchive, but including <archive.h> always
found kerfuffle/archive.h and there is no way how to force using /usr/include/archive.h instead.

Reviewed-by: Lukáš Tinkl
parent 7297c9ac
......@@ -28,7 +28,7 @@
#include "batchextract.h"
#include "kerfuffle/archive.h"
#include "kerfuffle/archive_kerfuffle.h"
#include "kerfuffle/extractiondialog.h"
#include "kerfuffle/jobs.h"
#include "kerfuffle/queries.h"
......
......@@ -21,7 +21,7 @@
#include "extractHereDndPlugin.h"
#include "batchextract.h"
#include "kerfuffle/archive.h"
#include "kerfuffle/archive_kerfuffle.h"
#include <KAction>
#include <QDebug>
......
......@@ -22,7 +22,7 @@
*
*/
#include "mainwindow.h"
#include "kerfuffle/archive.h"
#include "kerfuffle/archive_kerfuffle.h"
#include "part/interface.h"
#include <KPluginFactory>
......
......@@ -4,7 +4,7 @@
########### next target ###############
set(kerfuffle_SRCS
archive.cpp
archive_kerfuffle.cpp
archiveinterface.cpp
jobs.cpp
extractiondialog.cpp
......
......@@ -28,7 +28,7 @@
#include "adddialog.h"
#include "ui_adddialog.h"
#include "kerfuffle/archive.h"
#include "kerfuffle/archive_kerfuffle.h"
#include <KConfigGroup>
#include <KFilePlacesModel>
......
......@@ -28,7 +28,7 @@
#include "addtoarchive.h"
#include "adddialog.h"
#include "archive.h"
#include "archive_kerfuffle.h"
#include "jobs.h"
#include <KConfig>
......
......@@ -25,7 +25,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "archive.h"
#include "archive_kerfuffle.h"
#include "archiveinterface.h"
#include "jobs.h"
......
......@@ -28,7 +28,7 @@
#ifndef ARCHIVEINTERFACE_H
#define ARCHIVEINTERFACE_H
#include "archive.h"
#include "archive_kerfuffle.h"
#include "kerfuffle_export.h"
#include <QObject>
......
......@@ -30,7 +30,7 @@
#include "kerfuffle_export.h"
#include "archiveinterface.h"
#include "archive.h"
#include "archive_kerfuffle.h"
#include "queries.h"
#include <KJob>
......
......@@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "kerfuffle/archive.h"
#include "kerfuffle/archive_kerfuffle.h"
#include <qtest_kde.h>
......
......@@ -28,7 +28,7 @@
#include "jsonparser.h"
#include "kerfuffle/archive.h"
#include "kerfuffle/archive_kerfuffle.h"
#include "kerfuffle/archiveinterface.h"
/**
......
......@@ -26,7 +26,7 @@
#ifndef JSONPARSER_H
#define JSONPARSER_H
#include "kerfuffle/archive.h"
#include "kerfuffle/archive_kerfuffle.h"
#include <QtCore/QIODevice>
#include <QtCore/QMap>
......
......@@ -22,7 +22,7 @@
*/
#include "archivemodel.h"
#include "kerfuffle/archive.h"
#include "kerfuffle/archive_kerfuffle.h"
#include "kerfuffle/jobs.h"
#include <QDebug>
......
......@@ -26,7 +26,7 @@
#include <QScopedPointer>
#include <kjobtrackerinterface.h>
#include "kerfuffle/archive.h"
#include "kerfuffle/archive_kerfuffle.h"
using Kerfuffle::ArchiveEntry;
......
......@@ -19,7 +19,7 @@
*
*/
#include "infopanel.h"
#include "kerfuffle/archive.h"
#include "kerfuffle/archive_kerfuffle.h"
#include <QLabel>
#include <QVBoxLayout>
......
......@@ -22,7 +22,7 @@
#ifndef INFOPANEL_H
#define INFOPANEL_H
#include "kerfuffle/archive.h"
#include "kerfuffle/archive_kerfuffle.h"
#include "archivemodel.h"
#include "ui_infopanel.h"
......
......@@ -28,7 +28,7 @@
#include "dnddbusinterfaceadaptor.h"
#include "infopanel.h"
#include "jobtracker.h"
#include "kerfuffle/archive.h"
#include "kerfuffle/archive_kerfuffle.h"
#include "kerfuffle/extractiondialog.h"
#include "kerfuffle/jobs.h"
#include "kerfuffle/settings.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