Hello community,
here is the log from the commit of package kerry for openSUSE:Factory
checked in at Fri Jul 31 22:38:26 CEST 2009.
--------
--- KDE/kerry/kerry.changes 2009-07-11 17:01:07.000000000 +0200
+++ /mounts/work_src_done/STABLE/kerry/kerry.changes 2009-07-31 22:26:17.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Jul 31 22:13:38 CEST 2009 - beineri@opensuse.org
+
+- update to latest SVN version (r1005337)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
fix-build.diff
kerry-0.2.90.tar.bz2
New:
----
kerry.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kerry.spec ++++++
--- /var/tmp/diff_new_pack.CN9ZXm/_old 2009-07-31 22:38:16.000000000 +0200
+++ /var/tmp/diff_new_pack.CN9ZXm/_new 2009-07-31 22:38:16.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kerry (Version 0.2.90)
+# spec file for package kerry (Version 0.2.90.svn1005337)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,18 +24,16 @@
Group: System/GUI/KDE
Summary: Desktop search tool
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Version: 0.2.90
+Version: 0.2.90.svn1005337
Release: 1
-Source: kerry-%{version}.tar.bz2
+Source: kerry.tar.bz2
Source1: po.tar.bz2
Patch: po.diff
-Patch1: fix-build.diff
Requires: beagle >= 0.3.0
Requires: libbeagle1 >= 0.3.0
Provides: kde4-kerry = 0.2.90
Obsoletes: kde4-kerry <= 0.2.90
%kde4_runtime_requires
-%kde4_pimlibs_requires
%description
A desktop search tool integrated with Beagle and KDE.
@@ -49,7 +47,6 @@
%prep
%setup -n kerry -b 1
%patch
-%patch1
%build
%cmake_kde4 -d build
++++++ kerry-0.2.90.tar.bz2 -> kerry.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/beagled.desktop new/kerry/src/beagled.desktop
--- old/kerry/src/beagled.desktop 2008-11-24 13:51:48.000000000 +0100
+++ new/kerry/src/beagled.desktop 2009-07-31 22:13:12.000000000 +0200
@@ -1,19 +1,25 @@
[Desktop Entry]
Type=Application
-Encoding=UTF-8
Exec=sleep 5 && beagled --bg
Name=Beagle Daemon
Name[cs]=Démon Beagle
+Name[de]=Beagle-Dienst
Name[el]=Δαίμονας Beagle
+Name[en_GB]=Beagle Dæmon
Name[es]=Demonio Beagle
Name[et]=Beagle'i deemon
Name[fr]=Démon Beagle
Name[ga]=Deamhan Beagle
Name[gl]=Daemon Beagle
Name[hi]=बीगल डेमन
+Name[hne]=बीगल डेमन
+Name[it]=Demone Beagle
Name[km]=ដេមិន Beagle
Name[ko]=Beagle 데몬
+Name[ml]=ബീഗിള് ഡെമണ്
+Name[nb]=Beagle-nisse
Name[nl]=Beagle-daemon
+Name[nn]=Beagle-teneste
Name[pt]=Servidor do Beagle
Name[pt_BR]=Servidor do Beagle
Name[ro]=Demon Beagle
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/beaglesearch.cpp new/kerry/src/beaglesearch.cpp
--- old/kerry/src/beaglesearch.cpp 2008-09-29 13:51:08.000000000 +0200
+++ new/kerry/src/beaglesearch.cpp 2009-07-31 22:13:12.000000000 +0200
@@ -22,7 +22,7 @@
#include
#include
#include
-#include
+#include <QApplication>
//Added by qt3to4:
#include <QCustomEvent>
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/beaglesearch.h new/kerry/src/beaglesearch.h
--- old/kerry/src/beaglesearch.h 2008-09-29 17:45:05.000000000 +0200
+++ new/kerry/src/beaglesearch.h 2009-07-31 22:13:12.000000000 +0200
@@ -21,11 +21,11 @@
#ifndef BEAGLESEARCH_H
#define BEAGLESEARCH_H
-#include
-#include
-#include
-#include
-#include
+#include <QObject>
+#include <QThread>
+#include <QStringList>
+#include <QRegExp>
+#include <QMutex>
#include <QLinkedList>
#include <Q3PtrList>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/hitwidget.cpp new/kerry/src/hitwidget.cpp
--- old/kerry/src/hitwidget.cpp 2008-11-24 14:52:14.000000000 +0100
+++ new/kerry/src/hitwidget.cpp 2009-07-31 22:13:12.000000000 +0200
@@ -23,14 +23,14 @@
#include
#include
#include
-#include
+#include <QToolButton>
#include
//Added by qt3to4:
#include <QEvent>
#include
#include
#include
-#include
+#include <QLayout>
//#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/hitwidget.h new/kerry/src/hitwidget.h
--- old/kerry/src/hitwidget.h 2008-10-03 09:04:16.000000000 +0200
+++ new/kerry/src/hitwidget.h 2009-07-31 22:13:12.000000000 +0200
@@ -21,7 +21,7 @@
#define HITWIDGET_H
#include
-#include
+#include <QDateTime>
//Added by qt3to4:
#include <QEvent>
#include "kwidgetlistbox.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kcm/CMakeLists.txt new/kerry/src/kcm/CMakeLists.txt
--- old/kerry/src/kcm/CMakeLists.txt 2008-11-24 14:52:14.000000000 +0100
+++ new/kerry/src/kcm/CMakeLists.txt 2009-07-31 22:13:11.000000000 +0200
@@ -14,7 +14,7 @@
kde4_add_plugin(kcm_kerry ${kcm_kerry_PART_SRCS} )
-target_link_libraries(kcm_kerry ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${BEAGLE_LDFLAGS})
+target_link_libraries(kcm_kerry ${KDE4_KFILE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${BEAGLE_LDFLAGS})
install(TARGETS kcm_kerry DESTINATION ${PLUGIN_INSTALL_DIR} )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kcm/backends.cpp new/kerry/src/kcm/backends.cpp
--- old/kerry/src/kcm/backends.cpp 2008-11-24 14:52:14.000000000 +0100
+++ new/kerry/src/kcm/backends.cpp 2009-07-31 22:13:11.000000000 +0200
@@ -21,11 +21,11 @@
#include "backends.h"
-#include
+#include <QDir>
#include
-#include
-#include
-#include
+#include <QFile>
+#include <QLabel>
+#include <QLayout>
//Added by qt3to4:
#include <Q3VBoxLayout>
#include
@@ -106,7 +106,7 @@
{
QString myBuf = QString::fromLatin1(buffer, len);
if (myBuf.startsWith("User:")) {
- QStringList list = QStringList::split('\n',myBuf);
+ QStringList list = myBuf.split('\n');
for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
if ((*it).startsWith(" - ")) {
Q3CheckListItem *item = new Q3CheckListItem(listview,(*it).mid(3),Q3CheckListItem::CheckBox);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kcm/indexing.cpp new/kerry/src/kcm/indexing.cpp
--- old/kerry/src/kcm/indexing.cpp 2008-11-24 14:52:14.000000000 +0100
+++ new/kerry/src/kcm/indexing.cpp 2009-07-31 22:13:11.000000000 +0200
@@ -24,13 +24,13 @@
#include
#include
-#include
-#include
-#include
+#include <QLabel>
+#include <QLayout>
+#include <QRadioButton>
//Added by qt3to4:
-#include <Q3HBoxLayout>
+#include <QHBoxLayout>
#include <Q3GridLayout>
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
#include <QTextStream>
#include
#include
@@ -46,13 +46,13 @@
KCMBeagleIndexing::KCMBeagleIndexing(const KComponentData &inst, QWidget *parent)
: KCModule(inst, parent)
{
- Q3VBoxLayout* top_layout = new Q3VBoxLayout( this, KDialog::spacingHint() );
+ QVBoxLayout* top_layout = new QVBoxLayout( this, KDialog::spacingHint() );
// General
Q3GroupBox* gb_general = new Q3GroupBox(0, Qt::Vertical, i18n("General"), this);
top_layout->addWidget(gb_general);
gb_general->setFlat(true);
- Q3VBoxLayout* gb_general_layout = new Q3VBoxLayout( gb_general->layout(), KDialog::spacingHint() );
+ QVBoxLayout* gb_general_layout = new QVBoxLayout( gb_general->layout(), KDialog::spacingHint() );
startBeagle = new QCheckBox(i18n("Start Beagle indexing service automatically"), gb_general);
gb_general_layout->addWidget( startBeagle);
@@ -64,9 +64,9 @@
Q3GroupBox* gb_index = new Q3GroupBox(0, Qt::Vertical, i18n("Index"), this);
top_layout->addWidget(gb_index);
gb_index->setFlat(true);
- Q3VBoxLayout* gb_index_layout = new Q3VBoxLayout( gb_index->layout(), KDialog::spacingHint() );
+ QVBoxLayout* gb_index_layout = new QVBoxLayout( gb_index->layout(), KDialog::spacingHint() );
- Q3HBoxLayout* qh_index = new Q3HBoxLayout(gb_index_layout);
+ QHBoxLayout* qh_index = new QHBoxLayout(gb_index_layout);
indexHome = new QCheckBox(i18n("Index my home folder"), gb_index);
qh_index->addWidget( indexHome );
qh_index->addStretch(1);
@@ -101,7 +101,7 @@
Q3GroupBox* gb_privacy = new Q3GroupBox(0, Qt::Vertical, i18n("Privacy"), this);
top_layout->addWidget(gb_privacy);
gb_privacy->setFlat(true);
- Q3VBoxLayout* gb_privacy_layout = new Q3VBoxLayout( gb_privacy->layout(), KDialog::spacingHint() );
+ QVBoxLayout* gb_privacy_layout = new QVBoxLayout( gb_privacy->layout(), KDialog::spacingHint() );
QLabel* label_privacy = new QLabel(i18n( "Specify any resource, such as folder or pattern, you wish to exclude from indexing." ), gb_privacy);
gb_privacy_layout->addWidget(label_privacy);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kcm/indexing.h new/kerry/src/kcm/indexing.h
--- old/kerry/src/kcm/indexing.h 2008-11-24 14:52:14.000000000 +0100
+++ new/kerry/src/kcm/indexing.h 2009-07-31 22:13:11.000000000 +0200
@@ -22,7 +22,7 @@
#ifndef __INDEXING_H__
#define __INDEXING_H__
-#include
+#include <QCheckBox>
#include
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kcm/kerry.cpp new/kerry/src/kcm/kerry.cpp
--- old/kerry/src/kcm/kerry.cpp 2008-11-24 14:52:14.000000000 +0100
+++ new/kerry/src/kcm/kerry.cpp 2009-07-31 22:13:11.000000000 +0200
@@ -19,10 +19,9 @@
******************************************************************/
-#include
-#include
-//Added by qt3to4:
-#include <Q3VBoxLayout>
+#include <QLayout>
+#include <QTabWidget>
+#include <QVBoxLayout>
//#include
#include
#include
@@ -46,7 +45,7 @@
{
setButtons(KCModule::Default | KCModule::Apply);
- Q3VBoxLayout *layout = new Q3VBoxLayout(this);
+ QVBoxLayout *layout = new QVBoxLayout(this);
m_tab = new QTabWidget(this);
layout->addWidget(m_tab);
m_search = new KCMKerrySearch(KCMKerryFactory::componentData(), this);
@@ -108,7 +107,7 @@
QString KCMKerry::quickHelp() const
{
- QWidget *w = m_tab->currentPage();
+ QWidget *w = m_tab->currentWidget();
if (w->inherits("KCModule"))
{
KCModule *m = static_cast(w);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kcm/search.cpp new/kerry/src/kcm/search.cpp
--- old/kerry/src/kcm/search.cpp 2008-11-24 14:52:14.000000000 +0100
+++ new/kerry/src/kcm/search.cpp 2009-07-31 22:13:11.000000000 +0200
@@ -22,23 +22,22 @@
#include "search.h"
#include
-//Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
#include <QLabel>
KCMKerrySearch::KCMKerrySearch(const KComponentData &inst, QWidget *parent)
: KCModule(inst, parent)
{
- Q3VBoxLayout* top_layout = new Q3VBoxLayout( this, KDialog::spacingHint() );
+ QVBoxLayout* top_layout = new QVBoxLayout( this, KDialog::spacingHint() );
// General
Q3GroupBox* gb_general = new Q3GroupBox(0, Qt::Vertical, i18n("General"), this);
gb_general->setFlat(true);
top_layout->addWidget(gb_general);
- Q3VBoxLayout* gb_general_layout = new Q3VBoxLayout( gb_general->layout(), KDialog::spacingHint() );
+ QVBoxLayout* gb_general_layout = new QVBoxLayout( gb_general->layout(), KDialog::spacingHint() );
- Q3HBoxLayout* qh_layout = new Q3HBoxLayout(gb_general_layout);
+ QHBoxLayout* qh_layout = new QHBoxLayout(gb_general_layout);
QLabel* label_order = new QLabel(i18n("Default result sort order:"), gb_general);
qh_layout->addWidget(label_order);
combo_order = new QComboBox(gb_general);
@@ -50,7 +49,7 @@
label_order->setBuddy(combo_order);
qh_layout->addWidget(combo_order);
- Q3HBoxLayout* qh_number = new Q3HBoxLayout(gb_general_layout);
+ QHBoxLayout* qh_number = new QHBoxLayout(gb_general_layout);
QLabel* label_number = new QLabel(i18n( "Maximum number of results displayed:" ), gb_general);
qh_number->addWidget(label_number);
maxResultsDisplayed = new QSpinBox( 1, 100, 1, gb_general );
@@ -66,7 +65,7 @@
// Global Shortcuts
Q3GroupBox* gb_keys = new Q3GroupBox(0, Qt::Vertical, i18n("Global Shortcuts"), this);
- Q3VBoxLayout* gb_keys_layout = new Q3VBoxLayout( gb_keys->layout(), KDialog::spacingHint() );
+ QVBoxLayout* gb_keys_layout = new QVBoxLayout( gb_keys->layout(), KDialog::spacingHint() );
top_layout->addWidget(gb_keys);
gb_keys->setFlat(true);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kcm/search.h new/kerry/src/kcm/search.h
--- old/kerry/src/kcm/search.h 2008-11-24 14:52:14.000000000 +0100
+++ new/kerry/src/kcm/search.h 2009-07-31 22:13:11.000000000 +0200
@@ -22,14 +22,14 @@
#ifndef __SEARCH_H__
#define __SEARCH_H__
-#include
+#include <QCheckBox>
#include
-#include
-#include
+#include <QLabel>
+#include <QLayout>
#include
#include
#include
-#include
+#include <QComboBox>
#include
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kcm/select_privacy_resource.ui new/kerry/src/kcm/select_privacy_resource.ui
--- old/kerry/src/kcm/select_privacy_resource.ui 2008-11-24 14:52:14.000000000 +0100
+++ new/kerry/src/kcm/select_privacy_resource.ui 2009-07-31 22:13:11.000000000 +0200
@@ -64,8 +64,7 @@
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
+ <customwidgets>
<customwidget>
<class>Q3ButtonGroup</class>
<extends>Q3GroupBox</extends>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kcm/status.cpp new/kerry/src/kcm/status.cpp
--- old/kerry/src/kcm/status.cpp 2008-11-24 14:52:14.000000000 +0100
+++ new/kerry/src/kcm/status.cpp 2009-07-31 22:13:11.000000000 +0200
@@ -22,17 +22,17 @@
#include "status.h"
-#include
-#include
-#include
-#include
-//Added by qt3to4:
-#include <Q3VBoxLayout>
+#include <QDateTime>
+
+#include <QLayout>
+#include <QTimer>
+#include <QVBoxLayout>
#include <QLabel>
#include
#include
#include
#include
+#include
extern "C" {
#include
@@ -42,9 +42,9 @@
KCMBeagleStatus::KCMBeagleStatus(const KComponentData &inst, QWidget *parent)
: KCModule(inst, parent)
{
- Q3VBoxLayout* general_layout = new Q3VBoxLayout( this, KDialog::spacingHint() );
+ QVBoxLayout* general_layout = new QVBoxLayout( this, KDialog::spacingHint() );
- Q3HBox *control_box = new Q3HBox (this);
+ KHBox *control_box = new KHBox (this);
control_box->setSpacing (3);
general_layout->addWidget(control_box);
@@ -67,7 +67,7 @@
index_info_box = new Q3TextEdit (status_box);
index_info_box->setReadOnly (true);
- Q3HBox *footer_box = new Q3HBox (this);
+ KHBox *footer_box = new KHBox (this);
general_layout->addWidget(footer_box);
// Add some spacing to left
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kcm/status.h new/kerry/src/kcm/status.h
--- old/kerry/src/kcm/status.h 2008-11-24 14:52:14.000000000 +0100
+++ new/kerry/src/kcm/status.h 2009-07-31 22:13:11.000000000 +0200
@@ -23,7 +23,7 @@
#ifndef __STATUS_H__
#define __STATUS_H__
-#include
+#include <QLabel>
#include
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kerry.autostart.desktop new/kerry/src/kerry.autostart.desktop
--- old/kerry/src/kerry.autostart.desktop 2008-11-24 13:51:48.000000000 +0100
+++ new/kerry/src/kerry.autostart.desktop 2009-07-31 22:13:12.000000000 +0200
@@ -1,11 +1,15 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Kerry Beagle
+Name[de]=Kerry/Beagle
Name[hi]=केरी बीगल
+Name[hne]=केरी बीगल
+Name[ml]=കെറി ബീഗിള്
+Name[nn]=Kerry Beagle-søk
Name[x-test]=xxKerry Beaglexx
GenericName=Desktop Search
GenericName[be]=Пошук для працоўнага стала
GenericName[cs]=Hledání na ploše
+GenericName[de]=Desktop-Suche
GenericName[el]=Αναζήτηση επιφάνειας εργασίας
GenericName[es]=Búsqueda de escritorio
GenericName[et]=Töölauaotsing
@@ -13,10 +17,15 @@
GenericName[ga]=Cuardach Deisce
GenericName[gl]=Procuras de escritorio
GenericName[hi]=डेस्कटॉप खोज
+GenericName[hne]=डेस्कटाप खोज
+GenericName[it]=Ricerca del desktop
GenericName[km]=ការស្វែងរកផ្ទៃតុ
GenericName[ko]=데스크톱 검색
-GenericName[nds]=Schrievdischsöök
+GenericName[ml]=പണിയിടത്തില് തെരയല്
+GenericName[nb]=Skrivebordssøk
+GenericName[nds]=Schriefdischsöök
GenericName[nl]=Desktop-zoekactie
+GenericName[nn]=Skrivebordssøk
GenericName[pt]=Pesquisa no Ambiente de Trabalho
GenericName[pt_BR]=Pesquisa no ambiente de trabalho
GenericName[ro]=Căutare de birou
@@ -29,7 +38,7 @@
Exec=kerry
Icon=kerry
Type=Application
-Categories=Qt;KDE;Application;Core;Utility;Filesystem;
+Categories=Qt;KDE;Core;Utility;Filesystem;
Terminal=false
X-DCOP-ServiceType=Unique
X-KDE-StartupNotify=false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kerry.desktop new/kerry/src/kerry.desktop
--- old/kerry/src/kerry.desktop 2008-11-24 13:51:48.000000000 +0100
+++ new/kerry/src/kerry.desktop 2009-07-31 22:13:12.000000000 +0200
@@ -1,11 +1,15 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Kerry Beagle
+Name[de]=Kerry/Beagle
Name[hi]=केरी बीगल
+Name[hne]=केरी बीगल
+Name[ml]=കെറി ബീഗിള്
+Name[nn]=Kerry Beagle-søk
Name[x-test]=xxKerry Beaglexx
GenericName=Desktop Search
GenericName[be]=Пошук для працоўнага стала
GenericName[cs]=Hledání na ploše
+GenericName[de]=Desktop-Suche
GenericName[el]=Αναζήτηση επιφάνειας εργασίας
GenericName[es]=Búsqueda de escritorio
GenericName[et]=Töölauaotsing
@@ -13,10 +17,15 @@
GenericName[ga]=Cuardach Deisce
GenericName[gl]=Procuras de escritorio
GenericName[hi]=डेस्कटॉप खोज
+GenericName[hne]=डेस्कटाप खोज
+GenericName[it]=Ricerca del desktop
GenericName[km]=ការស្វែងរកផ្ទៃតុ
GenericName[ko]=데스크톱 검색
-GenericName[nds]=Schrievdischsöök
+GenericName[ml]=പണിയിടത്തില് തെരയല്
+GenericName[nb]=Skrivebordssøk
+GenericName[nds]=Schriefdischsöök
GenericName[nl]=Desktop-zoekactie
+GenericName[nn]=Skrivebordssøk
GenericName[pt]=Pesquisa no Ambiente de Trabalho
GenericName[pt_BR]=Pesquisa no ambiente de trabalho
GenericName[ro]=Căutare de birou
@@ -29,7 +38,7 @@
Exec=kerry --show-searchdialog
Icon=kerry
Type=Application
-Categories=Qt;KDE;Application;Core;Utility;Filesystem;
+Categories=Qt;KDE;Core;Utility;Filesystem;
Terminal=false
X-DCOP-ServiceType=Unique
X-KDE-StartupNotify=false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kerryapp.cpp new/kerry/src/kerryapp.cpp
--- old/kerry/src/kerryapp.cpp 2008-11-24 14:52:14.000000000 +0100
+++ new/kerry/src/kerryapp.cpp 2009-07-31 22:13:12.000000000 +0200
@@ -17,10 +17,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA *
***************************************************************************/
-#include
-#include
-#include
-#include
+#include <QString>
+#include <QStringList>
+#include <QDir>
+#include <QClipboard>
#include
#include
#include
@@ -30,9 +30,9 @@
#include
#include
-#include
+#include <QToolTip>
#include
-#include
+#include <QTimer>
#include "searchdlg.h"
#include "kerryapp.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/kerrylabel.cpp new/kerry/src/kerrylabel.cpp
--- old/kerry/src/kerrylabel.cpp 2008-09-30 16:41:19.000000000 +0200
+++ new/kerry/src/kerrylabel.cpp 2009-07-31 22:13:12.000000000 +0200
@@ -89,6 +89,7 @@
void KerryLabel::popupMenu( const QPoint &_global )
{
+ Q_UNUSED(_global);
/* KFileItem item( ((HitWidget*)parent())->uri(),((HitWidget*)parent())->mimetype(),KFileItem::Unknown);
KFileItemList _items;
_items.append( item );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/main.cpp new/kerry/src/main.cpp
--- old/kerry/src/main.cpp 2008-09-30 16:41:19.000000000 +0200
+++ new/kerry/src/main.cpp 2009-07-31 22:13:12.000000000 +0200
@@ -18,16 +18,16 @@
***************************************************************************/
#include
-#include
-#include
+#include <QObject>
+#include <QDir>
#include
#include
#include
#include
#include
-#include
-#include
+#include <QFileInfo>
+#include <QStringList>
#include
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/query.cpp new/kerry/src/query.cpp
--- old/kerry/src/query.cpp 2008-09-29 13:51:08.000000000 +0200
+++ new/kerry/src/query.cpp 2009-07-31 22:13:12.000000000 +0200
@@ -110,7 +110,7 @@
bool next_alternative = false;
- for ( QStringList::ConstIterator it = alt->excludes.begin(); it != alt->excludes.end(); ++it ) {
+ for ( QStringList::ConstIterator it = alt->excludes.constBegin(); it != alt->excludes.constEnd(); ++it ) {
if ( lower_term.find(*it)!=-1 ) {
next_alternative = true;
continue;
@@ -119,7 +119,7 @@
if (next_alternative)
continue;
- for ( QStringList::ConstIterator it = alt->includes.begin(); it != alt->includes.end(); ++it ) {
+ for ( QStringList::ConstIterator it = alt->includes.constBegin(); it != alt->includes.constEnd(); ++it ) {
if ( lower_term.find(*it)==-1 ) {
next_alternative = true;
continue;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/query.h new/kerry/src/query.h
--- old/kerry/src/query.h 2008-09-29 13:51:08.000000000 +0200
+++ new/kerry/src/query.h 2009-07-31 22:13:12.000000000 +0200
@@ -22,7 +22,7 @@
#ifndef QUERY_H
#define QUERY_H
-#include
+#include <QStringList>
#include
class Alternative
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kerry/src/searchdlg.cpp new/kerry/src/searchdlg.cpp
--- old/kerry/src/searchdlg.cpp 2008-11-24 14:52:14.000000000 +0100
+++ new/kerry/src/searchdlg.cpp 2009-07-31 22:13:12.000000000 +0200
@@ -23,17 +23,17 @@
#include "kwidgetlistbox.h"
#include "kerrylabel.h"
-#include
-#include
-#include
-//Added by qt3to4:
-#include <QMovie>
-#include <QPixmap>
-#include <QShowEvent>
-#include <QKeyEvent>
-#include <QEvent>
-#include <QCustomEvent>
-#include <Q3CString>
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
#include
#include
#include
@@ -47,23 +47,23 @@
#include
#include
#include
-#include
-#include
-#include
+#include <QDir>
+#include <QLabel>
+#include <QComboBox>
#include
#include
#include
#include
-#include
+#include <QRegExp>
#include
#include
-#include
+#include <QCheckBox>
#include
-#include
+#include <QToolButton>
#include
#include
#include
-#include
+#include <QCursor>
#include
#include
@@ -87,11 +87,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(), SIGNAL(returnPressed()), SLOT(search()));
connect(editSearch, SIGNAL(activated(const QString &)), SLOT(search(const QString &)));
@@ -1500,6 +1498,7 @@
void SearchDlg::slotOpenKNotes(const QString ¬eid)
{
+ Q_UNUSED(noteid);
/* if (ensureServiceRunning("knotes")) {
QByteArray data;
QDataStream arg(data, QIODevice::WriteOnly);
@@ -1614,7 +1613,7 @@
text += i18n("- A broader search scope might produce more results.")+"<br>";
text += i18n("- You should check the spelling of your search words.");
if (beagleJustStarted) {
- text += "<br>"+i18n("- The Beagle daemon was just started. Please be patient until it finished its indexing.");
+ text += "<br>"+i18n("- The Beagle daemon was just started. Please be patient until it has finished its indexing.");
beagleJustStarted = false;
}
item->setDescriptionText(text+"</qt>");
@@ -1647,12 +1646,12 @@
pPreviewMimeTypes->clear();
// Load the list of plugins to determine which mimetypes are supported
- KService::List plugins = KServiceTypeTrader::self()->query("ThumbCreator");
+ const KService::List plugins = KServiceTypeTrader::self()->query("ThumbCreator");
KService::List::ConstIterator it;
- for ( it = plugins.begin(); it != plugins.end(); ++it ) {
- QStringList mimeTypes = (*it)->property("MimeTypes").toStringList();
- for (QStringList::ConstIterator mt = mimeTypes.begin(); mt != mimeTypes.end(); ++mt)
+ for ( it = plugins.constBegin(); it != plugins.constEnd(); ++it ) {
+ const QStringList mimeTypes = (*it)->property("MimeTypes").toStringList();
+ for (QStringList::ConstIterator mt = mimeTypes.constBegin(); mt != mimeTypes.constEnd(); ++mt)
pPreviewMimeTypes->append(*mt);
}
}
@@ -1802,8 +1801,8 @@
if (list.isEmpty())
return;
- KServiceGroup::List::ConstIterator it = list.begin();
- for(; it != list.end(); ++it) {
+ KServiceGroup::List::ConstIterator it = list.constBegin();
+ for(; it != list.constEnd(); ++it) {
KSycocaEntry::Ptr e = (*it);
if(e) {
@@ -1881,8 +1880,8 @@
if (!m_addressBook)
m_addressBook = KABC::StdAddressBook::self( false );
- KABC::AddressBook::ConstIterator it = m_addressBook->begin();
- while (it!=m_addressBook->end()) {
+ KABC::AddressBook::ConstIterator it = m_addressBook->constBegin();
+ while (it!=m_addressBook->constEnd()) {
if (!current_query.matches((*it).assembledName()+' '+(*it).fullEmail())) {
it++;
continue;
@@ -2027,9 +2026,10 @@
bool SearchDlg::ensureServiceRunning(const QString & name)
{
+ Q_UNUSED(name);
/* QStringList URLs;
QByteArray data, replyData;
- Q3CString replyType;
+ QByteArray replyType;
QDataStream arg(data, QIODevice::WriteOnly);
arg << name << URLs;
@@ -2046,7 +2046,7 @@
return false;
}
int result;
- Q3CString dcopName;
+ QByteArray dcopName;
QString error;
// reply >> result >> dcopName >> error;
if (result != 0)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
