SOURCES: kdesdk-branch.diff - from upstream
arekm
arekm at pld-linux.org
Mon Jan 2 10:31:36 CET 2006
Author: arekm Date: Mon Jan 2 09:31:36 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- from upstream
---- Files affected:
SOURCES:
kdesdk-branch.diff (1.6 -> 1.7)
---- Diffs:
================================================================
Index: SOURCES/kdesdk-branch.diff
diff -u SOURCES/kdesdk-branch.diff:1.6 SOURCES/kdesdk-branch.diff:1.7
--- SOURCES/kdesdk-branch.diff:1.6 Tue Mar 29 13:30:27 2005
+++ SOURCES/kdesdk-branch.diff Mon Jan 2 10:31:31 2006
@@ -1,9630 +1,8578 @@
-diff -urN -x CVS kdesdk.orig/admin/acinclude.m4.in kdesdk/admin/acinclude.m4.in
---- kdesdk.orig/admin/acinclude.m4.in 2005-02-09 23:21:09.000000000 +0100
-+++ kdesdk/admin/acinclude.m4.in 2005-03-24 20:18:09.000000000 +0100
-@@ -1644,7 +1644,15 @@
-
- AC_MSG_RESULT([$kde_cv_uic_plugins])
- if test "$kde_cv_uic_plugins" != yes; then
-- AC_MSG_ERROR([you need to install kdelibs first.])
-+ AC_MSG_ERROR([
-+you need to install kdelibs first.
-+
-+If you did install kdelibs, then the Qt version that is picked up by
-+this configure is not the same version you used to compile kdelibs.
-+The Qt Plugin installed by kdelibs is *ONLY* loadable if its the
-+same Qt version, compiled with the same compiler and the same Qt
-+configuration settings.
-+])
- fi
- fi
- ])
-@@ -3104,8 +3112,8 @@
- fi
- rm -f conftest.h conftest.h.gch
- fi
-- AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
- fi
-+ AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
- if test "$CXX" = "KCC"; then
- dnl unfortunately we currently cannot disable exception support in KCC
- dnl because doing so is binary incompatible and Qt by default links with exceptions :-(
-@@ -3194,6 +3202,51 @@
- ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
- ])
-
-+AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG],
-+ [
-+ AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug,
-+ [
-+ AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+
-+ safe_CXXFLAGS=$CXXFLAGS
-+ safe_LDFLAGS=$LDFLAGS
-+ CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
-+ LDFLAGS="$LDFLAGS -shared -fPIC"
-+
-+ AC_TRY_LINK(
-+ [
-+ /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
-+ template<typename CharT>
-+ struct VisTest
-+ {
-+ inline VisTest ();
-+ };
-+ template<typename CharT>
-+ inline VisTest<CharT>::VisTest()
-+ {}
-+ extern template class VisTest<char>; // It works if we drop that line
-+ int some_function( int do_something ) __attribute__ ((visibility("default")));
-+ int some_function( int )
-+ {
-+ VisTest<char> a;
-+ return 0;
-+ }
-+ ], [/* elvis is alive */],
-+ kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes)
-+
-+ CXXFLAGS=$safe_CXXFLAGS
-+ LDFLAGS=$safe_LDFLAGS
-+ AC_LANG_RESTORE
-+ ]
-+ )
-+
-+ if test x$kde_cv_val_gcc_visibility_bug = xno; then
-+ CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-+ fi
-+ ]
-+)
-+
- AC_DEFUN([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY],
- [
- if test "$GXX" = "yes"; then
-@@ -3202,7 +3255,9 @@
- KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
- KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
- [
-- CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
-+ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+ KDE_CHECK_VISIBILITY_GCC_BUG
-+
- HAVE_GCC_VISIBILITY=1
- AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
- ])
-diff -urN -x CVS kdesdk.orig/admin/am_edit kdesdk/admin/am_edit
---- kdesdk.orig/admin/am_edit 2004-12-17 21:18:28.000000000 +0100
-+++ kdesdk/admin/am_edit 2005-03-29 11:15:16.000000000 +0200
-@@ -483,6 +483,7 @@
- $MakefileData =~ s/$lookup/$replacement/;
- $lookup =~ s/\\\$\\\(CXXFLAGS\\\)/\\\$\\\(KCXXFLAGS\\\)/;
- $replacement = "$stuff_before\$(KCXXFLAGS) \$(KDE_CXXFLAGS)$stuff_after";
-+ next if ($stuff_before =~ /\$\(KDE_CXXFLAGS\)/ or $stuff_after =~ /\$\(KDE_CXXFLAGS\)/);
- substituteLine($lookup, $replacement);
- } else {
- $found = 0;
-@@ -634,7 +635,7 @@
- if ($pre eq '' && exists($varcontent{$variable})) {
- my @addlist = split(/[\034\s]+/, $varcontent{$variable});
- push(@objlist, @addlist);
-- } elsif ($variable !~ 'OBJEXT') {
-+ } elsif ($variable !~ 'OBJEXT' && $variable !~ /am__objects_\d+/ ) {
- $ocv = 1;
- }
- }
-@@ -2276,7 +2277,7 @@
- "\t echo \"\$\$i\"; \\\n" .
- "\t if ! ";
- $t .= $cxxsuffix eq "KKK" ?
-- "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(KDE_CXXFLAGS) " :
-+ "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(CXXFLAGS) \$(KDE_CXXFLAGS) " :
- "\$(CXXCOMPILE) ";
- $t .= " --dump-class-hierarchy -c \$\$i.bchecktest.cc; then \\\n" .
- "\t rm -f \$\$i.bchecktest.cc; exit 1; \\\n" .
-@@ -2352,7 +2353,7 @@
- $MakefileData =~ s/\034/\\\n/g; # Restore continuation lines
- # Append our $progId line, _below_ the "generated by automake" line
- # because automake-1.6 relies on the first line to be his own.
-- my $progIdLine = "\# $progId - " . '$Revision$ '."\n";
-+ my $progIdLine = "\# $progId - " . '$Revision$ '."\n";
- if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) {
- warn "automake line not found in $makefile\n";
- # Fallback: first line
-diff -urN -x CVS kdesdk.orig/cervisia/cervisia.desktop kdesdk/cervisia/cervisia.desktop
---- kdesdk.orig/cervisia/cervisia.desktop 2004-12-09 23:48:53.000000000 +0100
-+++ kdesdk/cervisia/cervisia.desktop 2005-03-17 09:39:15.000000000 +0100
-@@ -13,6 +13,7 @@
- GenericName[eo]=Fasado por la versioadministrilo "CVS"
- GenericName[es]=Interfaz CVS
- GenericName[et]=CVSi kasutajaliides
-+GenericName[eu]=CVS interfazea
- GenericName[fi]=KäyttÜliittymä CVS:lle
- GenericName[fr]=Interface graphique pour CVS
- GenericName[he]=ממ׊ק CVS
-@@ -46,7 +47,6 @@
- GenericName[uk]=Đ†Đ˝Ń‚ĐľŃ€Ń„ĐľĐšŃ Đ´Đž CVS
- GenericName[ven]=CVS yo iswa phanda
- GenericName[xh]=CVS Isiqalo sesiphelo
--GenericName[xx]=xxCVS Frontendxx
- GenericName[zh_CN]=CVS ĺ‰çŤŻ
- GenericName[zh_TW]=CVS ĺ‰çŤŻ
- GenericName[zu]=CVSIsiqalo sokugcina
-@@ -62,7 +62,6 @@
- Name[hi]=सरŕĽŕ¤ľŕ¤żŕ¤¸ŕ¤żŕ¤Żŕ¤ž
- Name[ta]= ŕŽšŕŻ†ŕŽ°ŕŻŕŽľŕŽżŕŽŻŕŽž
- Name[th]=ŕš€ŕ¸‹ŕ¸ŕ¸ŁŕšŒŕ¸§ŕ¸´ŕš€ŕ¸‹ŕ¸ľŕ¸˘
--Name[xx]=xxCervisiaxx
- ServiceTypes=KParts/ReadOnlyPart,Browser/View
- X-KDE-Library=libcervisiapart
- X-KDE-BrowserView-Args=DetailedList
-diff -urN -x CVS kdesdk.orig/cervisia/cervisiapart.cpp kdesdk/cervisia/cervisiapart.cpp
---- kdesdk.orig/cervisia/cervisiapart.cpp 2005-01-09 19:55:08.000000000 +0100
-+++ kdesdk/cervisia/cervisiapart.cpp 2005-03-28 13:18:06.000000000 +0200
-@@ -1,7 +1,7 @@
- /*
- * Copyright (C) 1999-2002 Bernd Gehrmann
- * bernd at mail.berlios.de
-- * Copyright (c) 2002-2004 Christian Loose <christian.loose at kdemail.net>
-+ * Copyright (c) 2002-2005 Christian Loose <christian.loose at kdemail.net>
- *
- * This program may be distributed under the terms of the Q Public
- * License as defined by Trolltech AS of Norway and appearing in the
-@@ -88,7 +88,7 @@
- , opt_doCVSEdit( false )
- , recent( 0 )
- , cvsService( 0 )
-- , statusBar( 0 )
-+ , m_statusBar(new KParts::StatusBarExtension(this))
- , m_browserExt( 0 )
- , filterLabel( 0 )
- , m_editWithId(0)
-@@ -145,18 +145,6 @@
- "cvs DCOP service could not be started."),
- parentWidget));
-
-- statusBar = new CervisiaStatusBarExtension(this);
--
-- // create the active filter indicator and add it to the statusbar
-- filterLabel = new QLabel("UR", statusBar->statusBar());
-- filterLabel->setFixedSize(filterLabel->sizeHint());
-- filterLabel->setText("");
-- QToolTip::add(filterLabel,
-- i18n("F - All files are hidden, the tree shows only folders\n"
-- "N - All up-to-date files are hidden\n"
-- "R - All removed files are hidden"));
-- statusBar->addStatusBarItem(filterLabel, 0, true);
+Index: kbabel/kbabel/kbabelview.cpp
+===================================================================
+--- kbabel/kbabel/kbabelview.cpp (.../tags/KDE/3.5.0/kdesdk) (revision 493327)
++++ kbabel/kbabel/kbabelview.cpp (.../branches/KDE/3.5/kdesdk) (revision 493327)
+@@ -33,12 +33,6 @@
+
+ **************************************************************************** */
+
+-#include "config.h"
-
- if( cvsService )
+-#ifdef HAVE_UNISTD_H
+-#include <unistd.h>
+-#endif
+-
+ #include "kbabelview.h"
+
+ #include "catalogfileplugin.h"
+@@ -440,8 +434,8 @@
+
+ hb->addStretch(1);
+
+- QString ledMsg=i18n("<qt><p><b>Status LEDS</b></p>\n"
+- "<p>These LEDS display the status of the currently displayed message.\n"
++ QString ledMsg=i18n("<qt><p><b>Status LEDs</b></p>\n"
++ "<p>These LEDs display the status of the currently displayed message.\n"
+ "You can change their color in the preferences dialog section\n"
+ "<b>Editor</b> on page <b>Appearance</b></p></qt>");
+ QWhatsThis::add(_fuzzyLed,ledMsg);
+@@ -1518,7 +1512,7 @@
+ case KMessageBox::Continue:
+ {
+ // ask for new filename
+- if ((url = KFileDialog::getSaveURL(currentURL().url(),i18n("*.po *.pot|Gettext Files"),this)).isEmpty())
++ if ((url = KFileDialog::getSaveURL(currentURL().url(), CatalogExportPlugin::availableExportMimeTypes().join(" "), this)).isEmpty())
+ {
+ // if no filename was given cancel all
+ return false;
+@@ -1616,7 +1610,7 @@
+ }
+ }
+
+- unlink(tmpname.local8Bit());
++ QFile::remove( tmpname );
+
+ return result;
+ }
+@@ -1654,7 +1648,7 @@
+ if(!msgOnlyAtError)
+ {
+ KMessageBox::sorry(this
+- ,i18n("You can use gettext tools only for checking GNU PO files."));
++ ,i18n("You can use gettext tools only for checking PO files."));
+ }
+ returnCode=true;
+ break;
+Index: kbabel/kbabel/kbabel.cpp
+===================================================================
+--- kbabel/kbabel/kbabel.cpp (.../tags/KDE/3.5.0/kdesdk) (revision 493327)
++++ kbabel/kbabel/kbabel.cpp (.../branches/KDE/3.5/kdesdk) (revision 493327)
+@@ -1704,9 +1704,9 @@
+ QString oldproject = m_view->project();
+ if( oldproject == KBABEL_DEFAULTPROJECT )
{
- setupActions();
-@@ -165,6 +153,8 @@
+- oldproject = "";
++ oldproject = QString();
}
+- QString file = KFileDialog::getOpenFileName(oldproject, i18n("*|All Files"), this);
++ const QString file = KFileDialog::getOpenFileName(oldproject, QString::null, this);
+ if (file.isEmpty())
+ {
+ return;
+Index: kbabel/kbabel/kbabelview2.cpp
+===================================================================
+--- kbabel/kbabel/kbabelview2.cpp (.../tags/KDE/3.5.0/kdesdk) (revision 493327)
++++ kbabel/kbabel/kbabelview2.cpp (.../branches/KDE/3.5/kdesdk) (revision 493327)
+@@ -691,8 +691,8 @@
- setXMLFile( "cervisiaui.rc" );
-+
-+ QTimer::singleShot(0, this, SLOT(slotSetupStatusBar()));
+ if(url.isEmpty())
+ {
+- url = KFileDialog::getOpenURL(_project->settings()->diffBaseDir(), i18n("*.po *.pot|Gettext Files")
+- ,this, i18n("Select File to Diff With"));
++ url = KFileDialog::getOpenURL(_project->settings()->diffBaseDir(),
++"application/x-gettext", this, i18n("Select File to Diff With"));
+ }
+
+ if(url.isEmpty())
+Index: kbabel/kbabel/kbabel.desktop
+===================================================================
+--- kbabel/kbabel/kbabel.desktop (.../tags/KDE/3.5.0/kdesdk) (revision 493327)
++++ kbabel/kbabel/kbabel.desktop (.../branches/KDE/3.5/kdesdk) (revision 493327)
+@@ -10,7 +10,6 @@
+ Name[pt_BR]=Editor de POTFiles
+ Name[sv]=Kbabel
+ Name[ta]=KŕŽŞŕŽžŕŽŞŕŻ‡ŕŽ˛ŕŻ
+-Name[xx]=xxKBabelxx
+ Exec=kbabel %i %m -caption "%c" %U
+ Icon=kbabel
+ Type=Application
+@@ -70,7 +69,6 @@
+ GenericName[ven]=Zwishumiswa zwau Dologa
+ GenericName[vi]=Công c᝼ dᝋch
+ GenericName[xh]=Isixhobo Soguqulelo lomsebenzi kolunye ulwimi
+-GenericName[xx]=xxTranslation Toolxx
+ GenericName[zh_CN]=翝译塼ĺ
ˇ
+ GenericName[zh_TW]=çżťčŻĺˇĽĺ
ˇ
+ GenericName[zu]=Ithuluzi Lokuguqulela
+Index: kbabel/kbabel/kbabel.kcfg
+===================================================================
+--- kbabel/kbabel/kbabel.kcfg (.../tags/KDE/3.5.0/kdesdk) (revision 493327)
++++ kbabel/kbabel/kbabel.kcfg (.../branches/KDE/3.5/kdesdk) (revision 493327)
+@@ -227,7 +227,7 @@
+ <entry name="RecentFiles" key="Recent Files" type="String">
+ <label>
+ </label>
+- <default>$HOME/kde/kde-i18n/templates/kdelibs,$HOME/kde/kde-i18n/sk/messages/kdelibs,$HOME/done,$HOME/foo2,$HOME/foo,$HOME/.kde/share/config/kbabel.defaultproject,$HOME/no,$HOME/ahoj.po,$HOME/bla.po</default>
++ <default></default>
+ </entry>
+ <entry name="ShowPreviews" type="Bool">
+ <label>
+Index: kbabel/kbabel/main.cpp
+===================================================================
+--- kbabel/kbabel/main.cpp (.../tags/KDE/3.5.0/kdesdk) (revision 493327)
++++ kbabel/kbabel/main.cpp (.../branches/KDE/3.5/kdesdk) (revision 493327)
+@@ -507,7 +507,7 @@
+ {
+ KAboutData about("kbabel",I18N_NOOP("KBabel"),VERSION,
+ I18N_NOOP("An advanced PO file editor"),KAboutData::License_GPL,
+- I18N_NOOP("(c) 1999,2000,2001,2002,2003,2004,2005 The KBabel developers"),0,"http://i18n.kde.org/tools/kbabel");
++ I18N_NOOP("(c) 1999,2000,2001,2002,2003,2004,2005,2006 The KBabel developers"),0,"http://i18n.kde.org/tools/kbabel");
+
+ about.addAuthor("Matthias Kiefer",I18N_NOOP("Original author"),"kiefer at kde.org");
+ about.addAuthor("Wolfram Diestel"
+@@ -522,7 +522,7 @@
+ ,"dubbleu at web.de");
+ about.addAuthor("Asgeir Frimannsson",I18N_NOOP("Translation List View")
+ ,"asgeirf at redhat.com");
+- about.addAuthor("Nicolas Goutte", I18N_NOOP("Filter improvements"), "goutte at kde.org");
++ about.addAuthor("Nicolas Goutte", I18N_NOOP("Current maintainer"), "goutte at kde.org");
+
+ about.addCredit("Claudiu Costin",I18N_NOOP("Wrote documentation and sent "
+ "many bug reports and suggestions for improvements.")
+Index: kbabel/kbabel/sourceview.cpp
+===================================================================
+--- kbabel/kbabel/sourceview.cpp (.../tags/KDE/3.5.0/kdesdk) (revision 493327)
++++ kbabel/kbabel/sourceview.cpp (.../branches/KDE/3.5/kdesdk) (revision 493327)
+@@ -61,8 +61,8 @@
+ {
+ if (isVisible ())
+ {
+- _contextView->setContext(_catalog->packageDir()
+- ,_catalog->packageName(), _catalog->context(_currentIndex));
++ // Note: we use Catalog::comment instead of Catalog::context as SourceContext::setContext has to repeat the major part of the code of Catalog::context, so SourceContext::setContext can do the whole job alone.
++ _contextView->setContext( _catalog->packageDir(), _catalog->packageName(), _catalog->comment(_currentIndex), _catalog->currentURL() );
+ }
}
- CervisiaPart::~CervisiaPart()
-@@ -207,6 +197,20 @@
- return openSandbox( u.path() );
+Index: kbabel/kbabeldict/kbabeldict.desktop
+===================================================================
+--- kbabel/kbabeldict/kbabeldict.desktop (.../tags/KDE/3.5.0/kdesdk) (revision 493327)
++++ kbabel/kbabeldict/kbabeldict.desktop (.../branches/KDE/3.5/kdesdk) (revision 493327)
+@@ -14,6 +14,7 @@
+ Name[fi]=KBabel sanakirja
+ Name[fr]=Dictionnaire de KBabel
+ Name[ga]=KBabel - FoclĂłir
++Name[he]=KBabel - מילון
+ Name[hu]=KBabel szĂłtĂĄr
+ Name[is]=KBabel orĂ°abĂłk
+ Name[it]=Dizionario di KBabel
+@@ -31,7 +32,6 @@
+ Name[sv]=Kbabel ordlista
+ Name[tr]=KBabel SĂśzlĂźÄŸĂź
+ Name[uk]=ХНОвник KBabel
+-Name[xx]=xxKBabel Dictionaryxx
+ Name[zh_CN]=KBabel čŻĺ
¸
+ GenericName=Translation Tool Dictionary
+ GenericName[bg]=Đ˜Đ˝ŃŃ‚Ń€ŃƒĐźĐľĐ˝Ń‚ Са провОд
+@@ -47,6 +47,7 @@
+ GenericName[fi]=KäännÜstyÜkalun kansio
+ GenericName[fr]=Dictionnaire d'un outil de traduction
+ GenericName[ga]=Uirlis AistriĂşchĂĄin - FoclĂłir
++GenericName[he]=מילון ׊ל כלי תרגו×
+ GenericName[hu]=FordĂtĂĄssegĂtĹ‘ szĂłtĂĄr
+ GenericName[is]=Þýðingaforrit orðabók
+ GenericName[it]=Dizionario di uno strumento di traduzione
+@@ -64,7 +65,6 @@
+ GenericName[sv]=Översättningsverktyg ordlista
+ GenericName[tr]=Çeviri AracÄą SĂśzlĂźÄŸĂź
+ GenericName[uk]=ХНОвник СаŃĐžĐąŃƒ Đ´ĐťŃ ĐżĐľŃ€ĐľĐşĐťĐ°Đ´Ń–Đ˛
+-GenericName[xx]=xxTranslation Tool Dictionaryxx
+ GenericName[zh_CN]=翝译塼ĺ
ˇčŻĺ
¸
+ Exec=kbabeldict %i %m -caption "%c"
+ Icon=kbabeldict
+Index: kbabel/kbabeldict/kbabeldict_module.desktop
+===================================================================
+--- kbabel/kbabeldict/kbabeldict_module.desktop (.../tags/KDE/3.5.0/kdesdk) (revision 493327)
++++ kbabel/kbabeldict/kbabeldict_module.desktop (.../branches/KDE/3.5/kdesdk) (revision 493327)
+@@ -38,7 +38,6 @@
+ Comment[tg]=ĐœĐžĐ´ŃƒĐťĐ¸ ĐťŃƒŇ“Đ°Ń‚ йарОи KBabelDict
+ Comment[tr]=KBabelDict için SÜzlßk Modßlß
+ Comment[uk]=ĐœĐžĐ´ŃƒĐťŃŒ ŃНОвника Đ´ĐťŃ KBabelDict
+-Comment[xx]=xxDictionary module for KBabelDictxx
+ Comment[zh_CN]=KBabelDict çš„čŻĺ
¸ć¨Ąĺ—
+
+ [PropertyDef::Applications]
+Index: kbabel/kbabeldict/kbabeldict.cpp
+===================================================================
+--- kbabel/kbabeldict/kbabeldict.cpp (.../tags/KDE/3.5.0/kdesdk) (revision 493327)
++++ kbabel/kbabeldict/kbabeldict.cpp (.../branches/KDE/3.5/kdesdk) (revision 493327)
+@@ -58,6 +58,9 @@
+ // HACK: hide default button, otherwise it would be Help button
+ showButtonOK(false);
+
++ // KBabelDict has not a separate help file, so point to the correct part of the KBabel documentation
++ setHelp( "using-kbabeldict", "kbabel" );
++
+ setMainWidget(view);
+
+ readConfig();
+Index: kbabel/kbabeldict/modules/pocompendium/pocompendium.desktop
+===================================================================
+--- kbabel/kbabeldict/modules/pocompendium/pocompendium.desktop (.../tags/KDE/3.5.0/kdesdk) (revision 493327)
++++ kbabel/kbabeldict/modules/pocompendium/pocompendium.desktop (.../branches/KDE/3.5/kdesdk) (revision 493327)
+@@ -36,7 +36,6 @@
+ Name[tg]=ĐœĐžĐ´ŃƒĐťĐ¸ Ń‚Đ°Ńвири PO йарОи KBabelDict
+ Name[tr]=KBabelDict için PO Özet Modßlß
+ Name[uk]=ĐœĐžĐ´ŃƒĐťŃŒ Сйірки порокНадів PO Đ´ĐťŃ KBabelDict
+-Name[xx]=xxPO Compendium Module for KBabelDictxx
+ Name[zh_CN]=KBabelDict çš„ PO 挂čŚčŻĺ
¸ć¨Ąĺ—
+ X-KDE-Library=kbabeldict_pocompendium
+ ServiceTypes=KBabelDictModule
+
+Property changes on: kbabel/kbabeldict/modules/pocompendium
+___________________________________________________________________
+Name: svn:ignore
+ - Makefile
+Makefile.in
+ + Makefile
+Makefile.in
+*.moc
+.libs
+.deps
+
+
+Index: kbabel/kbabeldict/modules/dbsearchengine/dbsearchengine.desktop
+===================================================================
+--- kbabel/kbabeldict/modules/dbsearchengine/dbsearchengine.desktop (.../tags/KDE/3.5.0/kdesdk) (revision 493327)
++++ kbabel/kbabeldict/modules/dbsearchengine/dbsearchengine.desktop (.../branches/KDE/3.5/kdesdk) (revision 493327)
+@@ -37,7 +37,6 @@
+ Name[tg]=БаСаи ĐźĐ°ŃŠĐťŃƒĐźĐžŃ‚Đ¸ Ń‚Đ°Ń€ŇˇŃƒĐźĐ°ŇłĐž йарОи KBabelDict
+ Name[tr]=KBabelDict için Çeviri VeritabanĹ
+ Name[uk]=БаСа даниŃ
порокНадів Đ´ĐťŃ KBabelDict
+-Name[xx]=xxTranslation Database for KBabelDictxx
+ Name[zh_CN]=KBabelDict 的翝译数ćŽĺş“
+ X-KDE-Library=kbabeldict_dbsearchengine
+ ServiceTypes=KBabelDictModule
+
+Property changes on: kbabel/kbabeldict/modules/dbsearchengine
+___________________________________________________________________
+Name: svn:ignore
+ - Makefile
+Makefile.in
+ + Makefile
+Makefile.in
+*.moc
+.libs
+.deps
+
+
+Index: kbabel/kbabeldict/modules/dbsearchengine2/dbsearchengine2.desktop
+===================================================================
+--- kbabel/kbabeldict/modules/dbsearchengine2/dbsearchengine2.desktop (.../tags/KDE/3.5.0/kdesdk) (revision 493327)
++++ kbabel/kbabeldict/modules/dbsearchengine2/dbsearchengine2.desktop (.../branches/KDE/3.5/kdesdk) (revision 493327)
+@@ -37,7 +37,6 @@
+ Name[tg]=ТафŃири 2 йаСаи ĐźĐ°ŃŠĐťŃƒĐźĐžŃ‚Đ¸ Ń‚Đ°Ń€ŇˇŃƒĐźĐ°ŇłĐž йарОи KBabelDict
+ Name[tr]=KBabelDict için Çeviri VeritabanĹ v2
+ Name[uk]=ВорŃŃ–Ń 2 йаСи даниŃ
порокНадів Đ´ĐťŃ KBabelDict
+-Name[xx]=xxTranslation Database v2 for KBabelDictxx
+ Name[zh_CN]=KBabelDict 的翝译数ćŽĺş“ v2
+ X-KDE-Library=kbabeldict_dbsearchengine2
+ ServiceTypes=KBabelDictModule
+Index: kbabel/kbabeldict/modules/poauxiliary/poauxiliary.desktop
+===================================================================
+--- kbabel/kbabeldict/modules/poauxiliary/poauxiliary.desktop (.../tags/KDE/3.5.0/kdesdk) (revision 493327)
++++ kbabel/kbabeldict/modules/poauxiliary/poauxiliary.desktop (.../branches/KDE/3.5/kdesdk) (revision 493327)
+@@ -36,7 +36,6 @@
+ Name[tg]=ĐœĐžĐ´ŃƒĐťĐ¸ ёрираŃОни PO йарОи KBabelDict
+ Name[tr]=KBabelDict için YardĹmcĹ PO Modßlß
+ Name[uk]=ĐœĐžĐ´ŃƒĐťŃŒ дОпОПіМнОгО ŃНОвника PO Đ´ĐťŃ KBabelDict
+-Name[xx]=xxAuxiliary PO Module for KBabelDictxx
+ Name[zh_CN]=KBabelDict çš„ PO čž
劊čŻĺ
¸ć¨Ąĺ—
+ X-KDE-Library=kbabeldict_poauxiliary
+ ServiceTypes=KBabelDictModule
+
+Property changes on: kbabel/kbabeldict/modules/poauxiliary
+___________________________________________________________________
+Name: svn:ignore
+ - Makefile
+Makefile.in
+ + Makefile
+Makefile.in
+*.moc
+.libs
+.deps
+
+
+Index: kbabel/kbabeldict/modules/tmx/tmxcompendium.h
+===================================================================
+--- kbabel/kbabeldict/modules/tmx/tmxcompendium.h (.../tags/KDE/3.5.0/kdesdk) (revision 493327)
++++ kbabel/kbabeldict/modules/tmx/tmxcompendium.h (.../branches/KDE/3.5/kdesdk) (revision 493327)
+@@ -96,7 +96,7 @@
+ protected:
+ void loadCompendium();
+ void addResult(SearchResult *);
+- QString maskString(QString string);
++ QString maskString(QString string) const;
+
+ void registerData();
+ void unregisterData();
+Index: kbabel/kbabeldict/modules/tmx/tmxcompendium.desktop
+===================================================================
+--- kbabel/kbabeldict/modules/tmx/tmxcompendium.desktop (.../tags/KDE/3.5.0/kdesdk) (revision 493327)
++++ kbabel/kbabeldict/modules/tmx/tmxcompendium.desktop (.../branches/KDE/3.5/kdesdk) (revision 493327)
+@@ -36,7 +36,6 @@
+ Name[tg]=ĐœĐžĐ´ŃƒĐťĐ¸ Ń‚Đ°Ńвири TMX йарОи KBabelDict
+ Name[tr]=KBabelDict için TMX Özet Modßlß
+ Name[uk]=ĐœĐžĐ´ŃƒĐťŃŒ Сйірки порокНадів TMX Đ´ĐťŃ KBabelDict
+-Name[xx]=xxTMX Compendium Module for KBabelDictxx
+ Name[zh_CN]=KBabelDict çš„ TMX 挂čŚčŻĺ
¸ć¨Ąĺ—
+ X-KDE-Library=kbabeldict_tmxcompendium
+ ServiceTypes=KBabelDictModule
+Index: kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
+===================================================================
+--- kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp (.../tags/KDE/3.5.0/kdesdk) (revision 493327)
++++ kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp (.../branches/KDE/3.5/kdesdk) (revision 493327)
+@@ -41,7 +41,6 @@
+ #include <kinstance.h>
+ #include <kio/netaccess.h>
+
+-#include <qregexp.h>
+ #include <qtextstream.h>
+ #include <qtimer.h>
+
+@@ -747,21 +746,21 @@
+ loading=false;
}
-+
-+void CervisiaPart::slotSetupStatusBar()
-+{
-+ // create the active filter indicator and add it to the statusbar
-+ filterLabel = new QLabel("UR", m_statusBar->statusBar());
-+ filterLabel->setFixedSize(filterLabel->sizeHint());
-+ filterLabel->setText("");
-+ QToolTip::add(filterLabel,
-+ i18n("F - All files are hidden, the tree shows only folders\n"
-+ "N - All up-to-date files are hidden\n"
-+ "R - All removed files are hidden"));
-+ m_statusBar->addStatusBarItem(filterLabel, 0, true);
-+}
-+
- void CervisiaPart::setupActions()
+-QString TmxCompendium::maskString(QString s)
++QString TmxCompendium::maskString(QString s) const
{
- KAction *action;
-@@ -1734,7 +1738,8 @@
- str += "R";
- }
+- s.replace(QRegExp("\\\\"),"\\\\");
+- s.replace(QRegExp("\\?"),"\\?");
+- s.replace(QRegExp("\\["),"\\[");
+- s.replace(QRegExp("\\."),"\\.");
+- s.replace(QRegExp("\\*"),"\\*");
+- s.replace(QRegExp("\\+"),"\\+");
+- s.replace(QRegExp("\\^"),"\\^");
+- s.replace(QRegExp("\\$"),"\\$");
+- s.replace(QRegExp("\\("),"\\(");
+- s.replace(QRegExp("\\)"),"\\)");
+- s.replace(QRegExp("\\{"),"\\{");
+- s.replace(QRegExp("\\}"),"\\}");
+- s.replace(QRegExp("\\|"),"\\|");
++ s.replace('\\',"\\\\");
++ s.replace('?',"\\?");
++ s.replace('[',"\\[");
++ s.replace('.',"\\.");
++ s.replace('*',"\\*");
++ s.replace('+',"\\+");
++ s.replace('^',"\\^");
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kdesdk-branch.diff?r1=1.6&r2=1.7&f=u
More information about the pld-cvs-commit
mailing list