summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnu Mittal <anu22mittal@gmail.com>2015-03-15 02:38:50 (GMT)
committerAnu Mittal <anu22mittal@gmail.com>2015-03-15 02:38:50 (GMT)
commit5738d22874599295b8872cb7a5720cda79182629 (patch)
tree7dc0637c1f4a9a6e745d8c17efee128155fbad71
parent66be2212a43f328da215317f8763c9ac393882f2 (diff)
Removing warnings from main.cpp
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/main.cpp15
3 files changed, 10 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29f0395..b6582de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ include(KDECMakeSettings)
include(FeatureSummary)
include(ECMInstallIcons)
include(ECMMarkNonGuiExecutable)
-include_directories(${OPENBABEL2_INCLUDE_DIR} ${OPENGL_INCLUDE_DIRS} ${Qt5Declarative_INCLUDE_DIR})
+include_directories(${OPENBABEL2_INCLUDE_DIR} ${AVOGADRO_INCLUDE_DIR} ${OPENGL_INCLUDE_DIRS} ${Qt5Declarative_INCLUDE_DIR})
set(CMAKE_MODULE_PATH ${kalzium_SOURCE_DIR}/cmake/modules )
# search packages used by KDE
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8270f38..2ee0c95 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,7 +24,7 @@ if (OPENBABEL2_FOUND)
qt5_wrap_ui(kalziumtools_SRCS
tools/obconverterwidget.ui
)
- include_directories(${OPENBABEL2_INCLUDE_DIR} ${AVOGADROLIBS_INCLUDE_DIR})
+ include_directories(${OPENBABEL2_INCLUDE_DIR})
if (EIGEN3_FOUND AND Avogadro_FOUND)
diff --git a/src/main.cpp b/src/main.cpp
index 4ecc6f1..f5c2e9c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,8 +18,9 @@
***************************************************************************/
#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <klocale.h>
+#include <QCommandLineOption>
+#include <QLocale>
+#include <kaboutdata.h>
#include <kapplication.h>
@@ -45,7 +46,7 @@ int main(int argc, char **argv)
caml_startup(argv);
#endif
- /* KAboutData about("kalzium", 0, ki18n("Kalzium"), version, ki18n(description),
+ KAboutData about("kalzium", 0, ki18n("Kalzium"), version, ki18n(description),
KAboutData::License_GPL, ki18n("(C) 2002-2014 Carsten Niehaus"), KLocalizedString(), "http://edu.kde.org/kalzium");
about.addAuthor(ki18n("Carsten Niehaus"), KLocalizedString(), "cniehaus@kde.org");
about.addCredit(ki18n("Pino Toscano"), ki18n("Large code contributions; resident guru helping the other developers"));
@@ -73,12 +74,12 @@ int main(int argc, char **argv)
about.addCredit(ki18n("Tiago Porangaba"),ki18n("New interface design and usability improvements"));
about.addCredit(ki18n("Etienne Rebetez"),ki18n("Adding new sizable Periodic System"));
- KCmdLineArgs::init(argc, argv, &about);*/
- KCmdLineOptions options;
+ qCmdLineArgs::init(argc, argv, &about);
+ qCmdLineOptions options;
#if defined(HAVE_OPENBABEL2) && defined(HAVE_EIGEN) && defined(HAVE_AVOGADRO)
options.add("molecule <file>", ki18n("Open the given molecule file"));
#endif
- KCmdLineArgs::addCmdLineOptions(options);
+ qCmdLineArgs::addCmdLineOptions(options);
KApplication app;
Kalzium *mainWin = 0;
@@ -87,7 +88,7 @@ int main(int argc, char **argv)
RESTORE(Kalzium);
} else {
// no session.. just start up normally
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ qCmdLineArgs *args = qCmdLineArgs::parsedArgs();
/// @todo do something with the command line args here