Commit d92a9bd7 authored by Michael Reeves's avatar Michael Reeves
Browse files

*fix includes.

*correct auto conversion error in switching to new slot/singal syntax
parent a1565d24
...@@ -69,7 +69,7 @@ public: ...@@ -69,7 +69,7 @@ public:
m_pTextEdit->setWordWrapMode(QTextOption::NoWrap); m_pTextEdit->setWordWrapMode(QTextOption::NoWrap);
m_pTextEdit->setReadOnly(true); m_pTextEdit->setReadOnly(true);
QPushButton* pClose = new QPushButton(tr("Close")); QPushButton* pClose = new QPushButton(tr("Close"));
connect(pClose, &QPushButton::clicked, this, &DirectoryMergeInfo::accept); connect(pClose, &QPushButton::clicked, this, &QDialog::accept);
pVLayout->addWidget(pClose); pVLayout->addWidget(pClose);
} }
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#include <kfiledialog.h> #include <kfiledialog.h>
#include <QMenuBar> #include <QMenuBar>
#include <QStatusBar> #include <QStatusBar>
#include <klocale.h> #include <klocalizedstring.h>
#include <kconfig.h> #include <kconfig.h>
#include <kstandardaction.h> #include <kstandardaction.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
#include <ktoolbar.h> #include <ktoolbar.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kactioncollection.h> #include <kactioncollection.h>
#include <KConfigGroup>
// application specific includes // application specific includes
#include "kdiff3.h" #include "kdiff3.h"
...@@ -324,10 +323,10 @@ KDiff3App::KDiff3App(QWidget* pParent, const char* /*name*/, KDiff3Part* pKDiff3 ...@@ -324,10 +323,10 @@ KDiff3App::KDiff3App(QWidget* pParent, const char* /*name*/, KDiff3Part* pKDiff3
m_pDirectoryMergeSplitter->addWidget(m_pDirectoryMergeInfo); m_pDirectoryMergeSplitter->addWidget(m_pDirectoryMergeInfo);
connect(m_pDirectoryMergeWindow, &DirectoryMergeWindow::startDiffMerge, this, &KDiff3App::slotFileOpen2); connect(m_pDirectoryMergeWindow, &DirectoryMergeWindow::startDiffMerge, this, &KDiff3App::slotFileOpen2);
connect( m_pDirectoryMergeWindow->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&,const QItemSelection&)), this, SLOT(slotUpdateAvailabilities())); connect(m_pDirectoryMergeWindow->selectionModel(), &QItemSelectionModel::selectionChanged, this, &KDiff3App::slotUpdateAvailabilities);
connect( m_pDirectoryMergeWindow->selectionModel(), SIGNAL(currentChanged(const QModelIndex&,const QModelIndex&)), this, SLOT(slotUpdateAvailabilities())); connect(m_pDirectoryMergeWindow->selectionModel(), &QItemSelectionModel::currentChanged, this, &KDiff3App::slotUpdateAvailabilities);
connect(m_pDirectoryMergeWindow, &DirectoryMergeWindow::checkIfCanContinue, this, &KDiff3App::slotCheckIfCanContinue); connect(m_pDirectoryMergeWindow, &DirectoryMergeWindow::checkIfCanContinue, this, &KDiff3App::slotCheckIfCanContinue);
connect(m_pDirectoryMergeWindow, &DirectoryMergeWindow::updateAvailabilities, this, &KDiff3App::slotUpdateAvailabilities); connect(m_pDirectoryMergeWindow, SIGNAL(updateAvailabilities()), this, SLOT(slotUpdateAvailabilities()));
connect(m_pDirectoryMergeWindow, &DirectoryMergeWindow::statusBarMessage, this, &KDiff3App::slotStatusMsg); connect(m_pDirectoryMergeWindow, &DirectoryMergeWindow::statusBarMessage, this, &KDiff3App::slotStatusMsg);
m_pDirectoryMergeWindow->initDirectoryMergeActions( this, actionCollection() ); m_pDirectoryMergeWindow->initDirectoryMergeActions( this, actionCollection() );
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include <kparts/mainwindow.h> #include <kparts/mainwindow.h>
#include <ktoggleaction.h> #include <ktoggleaction.h>
#include <KAboutData> #include <KAboutData>
#include <kglobal.h>
// forward declaration of the KDiff3 classes // forward declaration of the KDiff3 classes
class OptionDialog; class OptionDialog;
class FindDialog; class FindDialog;
......
...@@ -52,7 +52,7 @@ KDiff3Shell::KDiff3Shell( bool bCompleteInit ) ...@@ -52,7 +52,7 @@ KDiff3Shell::KDiff3Shell( bool bCompleteInit )
statusBar()->show(); statusBar()->show();
// m_part = static_cast<KParts::ReadWritePart*>(factory->create(this, "KDiff3Part", QStringList("KParts::ReadWritePart"))); // m_part = static_cast<KParts::ReadWritePart*>(factory->create(this, "KDiff3Part", QStringList("KParts::ReadWritePart")));
m_part = new KDiff3Part( this, "KDiff3Part", this ); m_part = new KDiff3Part( this, this, QStringList("KDiff3Part") );
if (m_part) if (m_part)
{ {
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kfontdialog.h> #include <kfontdialog.h>
#include <QStatusBar.h> #include <qstatusbar.h>
#include <assert.h> #include <assert.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