Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
SDK
Kompare
Commits
ca5bee09
Commit
ca5bee09
authored
Oct 20, 2014
by
Jeremy Whiting
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove other kdelibs4support headers
REVIEW:120676
parent
66957a77
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
6 additions
and
18 deletions
+6
-18
komparenavtreepart/komparenavtreepart.cpp
komparenavtreepart/komparenavtreepart.cpp
+0
-1
komparepart/kompare_part.cpp
komparepart/kompare_part.cpp
+1
-2
komparepart/kompare_part.h
komparepart/kompare_part.h
+2
-9
komparepart/komparesaveoptionswidget.h
komparepart/komparesaveoptionswidget.h
+0
-1
kompareurldialog.h
kompareurldialog.h
+0
-3
libdialogpages/viewpage.cpp
libdialogpages/viewpage.cpp
+2
-1
main.cpp
main.cpp
+1
-1
No files found.
komparenavtreepart/komparenavtreepart.cpp
View file @
ca5bee09
...
...
@@ -23,7 +23,6 @@
#include <klocale.h>
#include <kaboutdata.h>
#include <kcomponentdata.h>
#include <kpluginfactory.h>
#include <kiconloader.h>
...
...
komparepart/kompare_part.cpp
View file @
ca5bee09
...
...
@@ -32,11 +32,11 @@
#include <kaboutdata.h>
#include <kactioncollection.h>
#include <kcomponentdata.h>
#include <kjobwidgets.h>
#include <klocalizedstring.h>
#include <kmessagebox.h>
#include <kpluginfactory.h>
#include <ksharedconfig.h>
#include <kstandardaction.h>
#include <kstandardshortcut.h>
...
...
@@ -64,7 +64,6 @@ DiffSettings* KomparePart::m_diffSettings = 0L;
KomparePart
::
KomparePart
(
QWidget
*
parentWidget
,
QObject
*
parent
,
const
QVariantList
&
/*args*/
)
:
KParts
::
ReadWritePart
(
parent
),
m_tempDiff
(
0
),
m_info
()
{
if
(
!
m_viewSettings
)
{
...
...
komparepart/kompare_part.h
View file @
ca5bee09
...
...
@@ -29,10 +29,9 @@
class
QAction
;
class
QPrinter
;
class
QUrl
;
class
QWidget
;
class
KTemporaryFile
;
class
KUrl
;
class
KAboutData
;
namespace
Diff2
{
...
...
@@ -179,17 +178,13 @@ signals:
protected:
/**
* This is the method that gets called when the file is opened,
* when using openURL( const
K
Url& ) or in our case also openDiff( const
K
Url& );
* when using openURL( const
Q
Url& ) or in our case also openDiff( const
Q
Url& );
* return true when everything went ok, false if there were problems
*/
virtual
bool
openFile
();
// ... Uhm we return true without saving ???
virtual
bool
saveFile
()
{
return
true
;
};
// patchFile
bool
patchFile
(
KUrl
&
);
bool
patchDir
();
protected
slots
:
void
slotSetStatus
(
Kompare
::
Status
status
);
void
slotShowError
(
QString
error
);
...
...
@@ -235,8 +230,6 @@ private:
QAction
*
m_print
;
QAction
*
m_printPreview
;
KTemporaryFile
*
m_tempDiff
;
struct
Kompare
::
Info
m_info
;
};
...
...
komparepart/komparesaveoptionswidget.h
View file @
ca5bee09
...
...
@@ -18,7 +18,6 @@
#ifndef KOMPARESAVEOPTIONSWIDGET_H
#define KOMPARESAVEOPTIONSWIDGET_H
#include <kurl.h>
#include <kompare.h>
#include "komparesaveoptionsbase.h"
...
...
kompareurldialog.h
View file @
ca5bee09
...
...
@@ -19,9 +19,6 @@
#define KOMPAREURLDIALOG_H
#include <kpagedialog.h>
#include <kurl.h>
class
FilesPage
;
class
FilesSettings
;
...
...
libdialogpages/viewpage.cpp
View file @
ca5bee09
...
...
@@ -29,7 +29,8 @@
#include <QTabWidget>
#include <kcolorbutton.h>
#include <klocale.h>
#include <klocalizedstring.h>
#include <ksharedconfig.h>
#include "viewsettings.h"
...
...
main.cpp
View file @
ca5bee09
...
...
@@ -27,7 +27,7 @@
#include <kaboutdata.h>
#include <kfile.h>
#include <klocal
e
.h>
#include <klocal
izedstring
.h>
#include <kmessagebox.h>
#include <QApplication>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment