Utils: Merge BaseValidatingLineEdit into FancyLineEdit

Change-Id: Idb7a6f28ac41bacbfd2603feb8b786c31d3769e3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
hjk
2014-02-13 16:13:54 +01:00
parent a74de6af81
commit 680209aef5
18 changed files with 226 additions and 345 deletions

View File

@@ -30,7 +30,6 @@
#include "pathchooser.h"
#include "fancylineedit.h"
#include "basevalidatinglineedit.h"
#include "environment.h"
#include "qtcassert.h"
@@ -64,7 +63,7 @@ namespace Utils {
// ------------------ PathValidatingLineEdit
class PathValidatingLineEdit : public BaseValidatingLineEdit
class PathValidatingLineEdit : public FancyLineEdit
{
public:
explicit PathValidatingLineEdit(PathChooser *chooser, QWidget *parent = 0);
@@ -77,7 +76,7 @@ private:
};
PathValidatingLineEdit::PathValidatingLineEdit(PathChooser *chooser, QWidget *parent) :
BaseValidatingLineEdit(parent),
FancyLineEdit(parent),
m_chooser(chooser)
{
QTC_ASSERT(chooser, return);