Marble::ConflictDialog Class Reference

#include <ConflictDialog.h>

Inheritance diagram for Marble::ConflictDialog:

Public Types
enum	Button { Local = 1, Cloud, AllLocal, AllCloud }
enum	ResolveAction { AskUser, PreferLocal, PreferCloud }

Public Slots
void	open ()
void	stopAutoResolve ()

Signals
void	resolveConflict (MergeItem *mergeItem)

Public Member Functions
	ConflictDialog (QWidget *parent=0)
void	setMergeItem (MergeItem *item)

Detailed Description

Definition at line 22 of file ConflictDialog.h.

Member Enumeration Documentation

enum Marble::ConflictDialog::Button

Enumerator
Local
Cloud
AllLocal
AllCloud

Definition at line 27 of file ConflictDialog.h.

enum Marble::ConflictDialog::ResolveAction

Enumerator
AskUser
PreferLocal
PreferCloud

Definition at line 34 of file ConflictDialog.h.

Constructor & Destructor Documentation

Marble::ConflictDialog::ConflictDialog

(

QWidget *

parent = 0

)

Definition at line 24 of file ConflictDialog.cpp.

Member Function Documentation

void Marble::ConflictDialog::open ( )

slot

Definition at line 42 of file ConflictDialog.cpp.

void Marble::ConflictDialog::resolveConflict ( MergeItem *  mergeItem )

signal

void Marble::ConflictDialog::setMergeItem

(

MergeItem *

item

)

Definition at line 32 of file ConflictDialog.cpp.

void Marble::ConflictDialog::stopAutoResolve ( )

slot

Definition at line 37 of file ConflictDialog.cpp.

---

The documentation for this class was generated from the following files:

• ConflictDialog.h
• ConflictDialog.cpp