Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
SDK
KDiff3
Commits
f7ada9b9
Commit
f7ada9b9
authored
Jul 30, 2016
by
Michael Reeves
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
*convert plugin loading to fully correct form
*add missing Q_OBJECT
parent
5c7ccc1e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
src/kdiff3_shell.cpp
src/kdiff3_shell.cpp
+12
-2
src/optiondialog.cpp
src/optiondialog.cpp
+1
-0
No files found.
src/kdiff3_shell.cpp
View file @
f7ada9b9
...
...
@@ -21,6 +21,9 @@
#include "kdiff3.h"
#include "kdiff3_part.h"
#include <KPluginMetaData>
#include <KPluginLoader>
#include <kshortcutsdialog.h>
#include <kfiledialog.h>
#include <kconfig.h>
...
...
@@ -51,8 +54,15 @@ KDiff3Shell::KDiff3Shell( bool bCompleteInit )
// and a status bar
statusBar
()
->
show
();
// m_part = static_cast<KParts::ReadWritePart*>(factory->create(this, "KDiff3Part", QStringList("KParts::ReadWritePart")));
m_part
=
new
KDiff3Part
(
this
,
this
,
QVariantList
()
<<
QVariant
(
QLatin1String
(
"KDiff3Part"
))
);
const
QVector
<
KPluginMetaData
>
plugin_offers
=
KPluginLoader
::
findPlugins
(
"kf5/kdiff3part"
);
foreach
(
const
KPluginMetaData
&
service
,
plugin_offers
)
{
KPluginFactory
*
factory
=
KPluginLoader
(
service
.
fileName
()).
factory
();
m_part
=
factory
->
create
<
KDiff3Part
>
(
this
,
QVariantList
()
<<
QVariant
(
QLatin1String
(
"KDiff3Part"
)));
if
(
m_part
)
break
;
}
//m_part = new KDiff3Part( this, this, QVariantList() << QVariant(QLatin1String("KDiff3Part")) );
if
(
m_part
)
{
...
...
src/optiondialog.cpp
View file @
f7ada9b9
...
...
@@ -378,6 +378,7 @@ private:
class
OptionEncodingComboBox
:
public
QComboBox
,
public
OptionItem
{
Q_OBJECT
QVector
<
QTextCodec
*>
m_codecVec
;
QTextCodec
**
m_ppVarCodec
;
public:
...
...
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