Renaming of files in preparation for code style tools.r14.0.10

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 283bc34244d24be02e90b767a82826a4ca8da186)

1 files changed, 0 insertions, 78 deletions

diff --git a/src/svnqt/conflictresult.hpp b/src/svnqt/conflictresult.hpp
deleted file mode 100644
index 917b79a..0000000
--- a/src/svnqt/conflictresult.hpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2007 by Rajko Albrecht  [email protected]             *
- *   http://tdesvn.alwins-world.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 _CONFLICT_RESULT_HPP
-#define _CONFLICT_RESULT_HPP
-
-struct svn_wc_conflict_result_t;
-
-#include "svnqt/pool.hpp"
-#include "svnqt/svnqt_defines.hpp"
-#include <svn_types.h>
-
-#include <tqstring.h>
-
-namespace svn {
-
-class SVNTQT_EXPORT ConflictResult
-{
-    public:
-        enum ConflictChoice {
-            //! let user make a call to resolve
-            ChoosePostpone,
-            ChooseBase,
-            ChooseTheirsFull,
-            ChooseMineFull,
-            ChooseTheirsConflict,
-            ChooseMineConflict,
-            ChooseMerged
-        };
-        ConflictResult();
-        //! Copy constructor
-        /*! only usefull wenn build with subversion 1.5 or newer
-         */
-        ConflictResult(const svn_wc_conflict_result_t*);
-
-        const TQString& mergedFile()const
-        {
-            return m_MergedFile;
-        }
-        void setMergedFile(const TQString&aMergedfile);
-
-        ConflictChoice choice()const
-        {
-            return m_choice;
-        }
-        void setChoice(ConflictChoice aValue);
-
-        const svn_wc_conflict_result_t*result(const Pool&pool)const;
-        void assignResult(svn_wc_conflict_result_t**aResult,const Pool&pool)const;
-
-    protected:
-        ConflictChoice m_choice;
-        //! Merged file
-        /*! will only used if m_choice is ChooseMerged
-         */
-        TQString m_MergedFile;
-};
-
-}
-
-#endif