Commit e5eac07e authored by Michael Reeves's avatar Michael Reeves

Move struct t_ItemInfo out of global scope

parent f2f77ee2
......@@ -46,6 +46,13 @@
#include <KTextEdit>
#include <KToggleAction>
struct DirectoryMergeWindow::t_ItemInfo {
bool bExpanded;
bool bOperationComplete;
QString status;
e_MergeOperation eMergeOperation;
};
class StatusInfo : public QDialog
{
private:
......@@ -704,13 +711,6 @@ void DirectoryMergeWindow::DirectoryMergeWindowPrivate::calcDirStatus(bool bThre
calcDirStatus(bThreeDirs, index(childIdx, 0, mi), nofFiles, nofDirs, nofEqualFiles, nofManualMerges);
}
struct t_ItemInfo {
bool bExpanded;
bool bOperationComplete;
QString status;
e_MergeOperation eMergeOperation;
};
bool DirectoryMergeWindow::init(
const QSharedPointer<DirectoryInfo>& dirInfo,
bool bDirectoryMerge,
......
......@@ -38,7 +38,9 @@ class KDiff3App;
class DirectoryMergeWindow : public QTreeView
{
Q_OBJECT
public:
public:
struct t_ItemInfo;
DirectoryMergeWindow( QWidget* pParent, const QSharedPointer<Options> &pOptions);
~DirectoryMergeWindow() override;
void setDirectoryMergeInfo(DirectoryMergeInfo* p);
......
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