From ab7549c7fe58b7375b527f10291dc3ca454dd9e0 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 31 Oct 2010 09:47:09 +0100 Subject: Fix merge code --- src/opensearch/opensearchengine.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/opensearch/opensearchengine.cpp') diff --git a/src/opensearch/opensearchengine.cpp b/src/opensearch/opensearchengine.cpp index f100bb60..9d5e866f 100644 --- a/src/opensearch/opensearchengine.cpp +++ b/src/opensearch/opensearchengine.cpp @@ -35,8 +35,10 @@ // Qt Includes #include -OpenSearchEngine::OpenSearchEngine(QObject *) - : m_parser(0) + +OpenSearchEngine::OpenSearchEngine(QObject *parent) + : QObject(parent) + , m_parser(0) { } -- cgit v1.2.1