Warning, file /sdk/cervisia/resolvedialog.h was not indexed or was modified since last indexation (in which case cross-reference links may be missing, inaccurate or erroneous).

 /*
  *  Copyright (C) 1999-2002 Bernd Gehrmann
  *                          bernd@mail.berlios.de
  *  Copyright (c) 2003-2004 Christian Loose <christian.loose@hamburg.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 #ifndef RESOLVEDIALOG_H
 #define RESOLVEDIALOG_H
 
 #include <QDialog>
 
 #include "diffview.h"
 #include <QList>
 
 class QLabel;
 class QTextCodec;
 class KConfig;
 class ResolveItem;
 
 class ResolveDialog : public QDialog
 {
     Q_OBJECT
 
 public:
     enum ChooseType { ChA, ChB, ChAB, ChBA, ChEdit };
 
     explicit ResolveDialog(KConfig &cfg, QWidget *parent = nullptr);
     ~ResolveDialog() override;
 
     bool parseFile(const QString &name);
 
 protected:
     void keyPressEvent(QKeyEvent *e) override;
 
 private slots:
     void backClicked();
     void forwClicked();
     void aClicked();
     void bClicked();
     void abClicked();
     void baClicked();
     void editClicked();
     void saveClicked();
     void saveAsClicked();
     void slotHelp();
 
 private:
     void updateNofN();
     void updateHighlight(int newitem);
     void choose(ChooseType ch);
     void chooseEdit();
     void saveFile(const QString &name);
     QString readFile();
     void addToMergeAndVersionA(const QString &line, DiffView::DiffType type, int &lineNo);
     void addToVersionB(const QString &line, DiffView::DiffType type, int &lineNo);
     void updateMergedVersion(ChooseType chosen);
     QString contentVersionA(const ResolveItem *item) const;
     QString contentVersionB(const ResolveItem *item) const;
 
     QLabel *nofnlabel;
     QPushButton *backbutton, *forwbutton;
     QPushButton *abutton, *bbutton, *abbutton, *babutton, *editbutton;
     DiffView *diff1, *diff2, *merge;
 
     QList<ResolveItem *> items;
     QString fname;
     QTextCodec *fcodec;
     int markeditem;
     KConfig &partConfig;
 
     QString m_contentMergedVersion;
 };
 
 #endif // RESOLVEDIALOG_H
 
 // Local Variables:
 // c-basic-offset: 4
 // End: