diff --git a/active/app/src/CMakeLists.txt b/active/app/src/CMakeLists.txt index b7163abaa..59bfb2f70 100644 --- a/active/app/src/CMakeLists.txt +++ b/active/app/src/CMakeLists.txt @@ -3,7 +3,6 @@ include_directories( ${KDE4_INCLUDES} ${QT_INCLUDES}) set(active-documentviewer_SRCS main.cpp - documentviewer.cpp ) kde4_add_kdeinit_executable(active-documentviewer ${active-documentviewer_SRCS}) diff --git a/active/app/src/documentviewer.cpp b/active/app/src/documentviewer.cpp deleted file mode 100644 index ebe5470f3..000000000 --- a/active/app/src/documentviewer.cpp +++ /dev/null @@ -1,37 +0,0 @@ -/*************************************************************************** - * * - * Copyright 2011 Sebastian Kügler * - * Copyright 2012 Marco Martin * - * * - * 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 . * - ***************************************************************************/ - -#include "documentviewer.h" -#include "kdeclarativeview.h" - - -DocumentViewer::DocumentViewer() - : KDeclarativeMainWindow() -{ - - declarativeView()->setPackageName("org.kde.active.documentviewer"); -} - -DocumentViewer::~DocumentViewer() -{ -} - -#include "documentviewer.moc" diff --git a/active/app/src/documentviewer.h b/active/app/src/documentviewer.h deleted file mode 100644 index b3c75b0ee..000000000 --- a/active/app/src/documentviewer.h +++ /dev/null @@ -1,41 +0,0 @@ -/*************************************************************************** - * * - * Copyright 2011 Sebastian Kügler * - * Copyright 2012 Marco Martin * - * * - * 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 DOCUMENTVIEWER_H -#define DOCUMENTVIEWER_H - -#include "kdeclarativemainwindow.h" - -#include - -class DirModel; - - -class DocumentViewer : public KDeclarativeMainWindow -{ - Q_OBJECT -public: - DocumentViewer(); - virtual ~DocumentViewer(); -}; - -#endif // DOCUMENTVIEWER_H diff --git a/active/app/src/main.cpp b/active/app/src/main.cpp index 926e8c28d..69adf645d 100644 --- a/active/app/src/main.cpp +++ b/active/app/src/main.cpp @@ -27,6 +27,9 @@ #include #include +#include "kdeclarativemainwindow.h" +#include "kdeclarativeview.h" + // Own #include "documentviewer.h" @@ -56,7 +59,8 @@ KDE_EXPORT int kdemain(int argc, char **argv) //kDebug() << "ARGS:" << args << args->count(); - DocumentViewer *mainWindow = new DocumentViewer(); + KDeclarativeMainWindow *mainWindow = new KDeclarativeMainWindow(); + mainWindow->declarativeView()->setPackageName("org.kde.active.documentviewer"); mainWindow->show(); args->clear(); return app.exec();