Commit be33b6d0 authored by Michael Reeves's avatar Michael Reeves

add explicit to constructors with on parameter

parent da2f01e1
...@@ -24,11 +24,7 @@ ...@@ -24,11 +24,7 @@
class DirectoryInfo class DirectoryInfo
{ {
public: public:
DirectoryInfo( DirectoryInfo(FileAccess& dirA, FileAccess& dirB, FileAccess& dirC, FileAccess& dirDest)
FileAccess& dirA,
FileAccess& dirB,
FileAccess& dirC,
FileAccess& dirDest)
{ {
m_dirA = dirA; m_dirA = dirA;
m_dirB = dirB; m_dirB = dirB;
......
...@@ -28,13 +28,7 @@ class DiffTextWindow : public QWidget ...@@ -28,13 +28,7 @@ class DiffTextWindow : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
DiffTextWindow( DiffTextWindow(DiffTextWindowFrame* pParent, QStatusBar* pStatusBar, Options* pOptions, int winIdx);
DiffTextWindowFrame* pParent,
QStatusBar* pStatusBar,
Options* pOptions,
int winIdx
);
~DiffTextWindow() override; ~DiffTextWindow() override;
void init( void init(
const QString& fileName, const QString& fileName,
......
...@@ -34,7 +34,7 @@ class FileAccess ...@@ -34,7 +34,7 @@ class FileAccess
public: public:
FileAccess(); FileAccess();
~FileAccess(); ~FileAccess();
FileAccess( const QString& name, bool bWantToWrite=false ); // name: local file or dirname or url (when supported) explicit FileAccess( const QString& name, bool bWantToWrite=false ); // name: local file or dirname or url (when supported)
void setFile( const QString& name, bool bWantToWrite=false ); void setFile( const QString& name, bool bWantToWrite=false );
void setFile( const QUrl& name, bool bWantToWrite = false); void setFile( const QUrl& name, bool bWantToWrite = false);
void setFile( FileAccess* pParent, QFileInfo fi ); void setFile( FileAccess* pParent, QFileInfo fi );
......
...@@ -46,7 +46,7 @@ public: ...@@ -46,7 +46,7 @@ public:
/** /**
* Default Constructor * Default Constructor
*/ */
KDiff3Shell(bool bCompleteInit=true); explicit KDiff3Shell(bool bCompleteInit=true);
/** /**
* Default Destructor * Default Destructor
......
...@@ -93,11 +93,7 @@ class MergeResultWindow : public QWidget ...@@ -93,11 +93,7 @@ class MergeResultWindow : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
MergeResultWindow( MergeResultWindow(QWidget* pParent, Options* pOptions, QStatusBar* pStatusBar);
QWidget* pParent,
Options* pOptions,
QStatusBar* pStatusBar
);
void init( void init(
const LineData* pLineDataA, LineRef sizeA, const LineData* pLineDataA, LineRef sizeA,
...@@ -194,7 +190,7 @@ private: ...@@ -194,7 +190,7 @@ private:
class MergeEditLine class MergeEditLine
{ {
public: public:
MergeEditLine(Diff3LineList::const_iterator i, int src=0){m_id3l=i; m_src=src; m_bLineRemoved=false; } explicit MergeEditLine(Diff3LineList::const_iterator i, int src=0){m_id3l=i; m_src=src; m_bLineRemoved=false; }
void setConflict() { m_src=0; m_bLineRemoved=false; m_str=QString(); } void setConflict() { m_src=0; m_bLineRemoved=false; m_str=QString(); }
bool isConflict() { return m_src==0 && !m_bLineRemoved && m_str.isEmpty(); } bool isConflict() { return m_src==0 && !m_bLineRemoved && m_str.isEmpty(); }
void setRemoved(int src=0) { m_src=src; m_bLineRemoved=true; m_str=QString(); } void setRemoved(int src=0) { m_src=src; m_bLineRemoved=true; m_str=QString(); }
......
...@@ -45,7 +45,7 @@ class OptionDialog : public KPageDialog ...@@ -45,7 +45,7 @@ class OptionDialog : public KPageDialog
public: public:
OptionDialog( bool bShowDirMergeSettings, QWidget *parent = nullptr ); explicit OptionDialog( bool bShowDirMergeSettings, QWidget *parent = nullptr );
~OptionDialog( void ) override; ~OptionDialog( void ) override;
QString parseOptions( const QStringList& optionList ); QString parseOptions( const QStringList& optionList );
QString calcOptionHelp(); QString calcOptionHelp();
......
...@@ -32,7 +32,7 @@ class OpenDialog : public QDialog ...@@ -32,7 +32,7 @@ class OpenDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
OpenDialog( OpenDialog(// krazy:exclude=explicit
QWidget* pParent, const QString& n1, const QString& n2, const QString& n3, QWidget* pParent, const QString& n1, const QString& n2, const QString& n3,
bool bMerge, const QString& outputName, const char* slotConfigure, Options* pOptions ); bool bMerge, const QString& outputName, const char* slotConfigure, Options* pOptions );
......
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