Branch: master

f9eefb88 2019-05-24 13:26:45 gregory guy 
silence some glib warnings, g_type_init() is deprecated since glib-2.36

Signed-off-by: gregory guy <g-gregory@...>
M kerry/src/kcm/status.cpp
M kerry/src/searchdlg.cpp

kerry/src/kcm/status.cpp

diff --git a/kerry/src/kcm/status.cpp b/kerry/src/kcm/status.cpp
index 0e4ba9a..dfef642 100644
--- a/kerry/src/kcm/status.cpp
+++ b/kerry/src/kcm/status.cpp
@@ -73,7 +73,9 @@
     pb_refresh = new KPushButton (i18n("Refresh Status"), footer_box);
     connect (pb_refresh, TQT_SIGNAL (clicked()), this, TQT_SLOT (refreshStatus ()) );
 
+#if !GLIB_CHECK_VERSION( 2,36,0 )
     g_type_init ();
+#endif
     refreshStatus ();
 
     load();

kerry/src/searchdlg.cpp

diff --git a/kerry/src/searchdlg.cpp b/kerry/src/searchdlg.cpp
index 32eabb0..25e428b 100644
--- a/kerry/src/searchdlg.cpp
+++ b/kerry/src/searchdlg.cpp
@@ -68,8 +68,9 @@
 static TQLabel* switchLabel[switchLabelCount] = {showEverything, showApplications, showContacts, showDocuments,
                                   showConversations, showImages, showMedia, showWebPages, showFilePathName, sortByType, sortByDate, sortByName, sortByRelevance, showAnyDate, showToday, showSinceYesterday, showThisWeek, 
                                   showThisMonth, showThisYear};
-
+#if !GLIB_CHECK_VERSION( 2,36,0 )
   g_type_init();
+#endif
   beagle_search = NULL;
   editSearch->setMaxCount(MAX_HISTORY_ITEMS);
   editSearch->setDuplicatesEnabled(false);
761e84be 2019-05-24 13:36:26 gregory guy 
remove KDE_IS_VERSION

Signed-off-by: gregory guy <g-gregory@...>
M kerry/src/searchdlg.cpp

kerry/src/searchdlg.cpp

diff --git a/kerry/src/searchdlg.cpp b/kerry/src/searchdlg.cpp
index 25e428b..7e3f27c 100644
--- a/kerry/src/searchdlg.cpp
+++ b/kerry/src/searchdlg.cpp
@@ -75,11 +75,9 @@
   editSearch->setMaxCount(MAX_HISTORY_ITEMS);
   editSearch->setDuplicatesEnabled(false);
 
-#if KDE_IS_VERSION( 3, 5, 4 )
   KLineEdit *lineedit = new KLineEdit(editSearch);
   lineedit->setClickMessage(i18n( "Applications, Contacts, Conversations, Files and more..." ) );
   editSearch->setLineEdit(lineedit);
-#endif
 
   connect(editSearch->lineEdit(), TQT_SIGNAL(returnPressed()), TQT_SLOT(search()));
   connect(editSearch->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(searchChanged(const TQString &)));

Branch: r14.0.x

5c0531ca 2019-05-24 13:57:35 gregory guy 
remove KDE_IS_VERSION

Signed-off-by: gregory guy <g-gregory@...>
(cherry picked from commit 761e84bed66bdc4dd947188a28f6d71cb2c0157c)
M kerry/src/searchdlg.cpp

kerry/src/searchdlg.cpp

diff --git a/kerry/src/searchdlg.cpp b/kerry/src/searchdlg.cpp
index 25e428b..7e3f27c 100644
--- a/kerry/src/searchdlg.cpp
+++ b/kerry/src/searchdlg.cpp
@@ -75,11 +75,9 @@
   editSearch->setMaxCount(MAX_HISTORY_ITEMS);
   editSearch->setDuplicatesEnabled(false);
 
-#if KDE_IS_VERSION( 3, 5, 4 )
   KLineEdit *lineedit = new KLineEdit(editSearch);
   lineedit->setClickMessage(i18n( "Applications, Contacts, Conversations, Files and more..." ) );
   editSearch->setLineEdit(lineedit);
-#endif
 
   connect(editSearch->lineEdit(), TQT_SIGNAL(returnPressed()), TQT_SLOT(search()));
   connect(editSearch->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(searchChanged(const TQString &)));