Hello community,
here is the log from the commit of package kdesdk4
checked in at Wed Mar 5 23:08:35 CET 2008.
--------
--- KDE/kdesdk4/kdesdk4.changes 2008-02-15 11:47:08.000000000 +0100
+++ kdesdk4/kdesdk4.changes 2008-03-05 00:34:16.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Feb 27 16:21:03 CET 2008 - dmueller@suse.de
+
+- update to 4.0.2
+
+-------------------------------------------------------------------
Old:
----
kdesdk-4.0.1.tar.bz2
New:
----
kdesdk-4.0.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdesdk4.spec ++++++
--- /var/tmp/diff_new_pack.W21931/_old 2008-03-05 23:07:59.000000000 +0100
+++ /var/tmp/diff_new_pack.W21931/_new 2008-03-05 23:07:59.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdesdk4 (Version 4.0.1)
+# spec file for package kdesdk4 (Version 4.0.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,9 +16,9 @@
Group: System/GUI/KDE
Summary: KDE SDK Package
Url: http://www.kde.org/
-Version: 4.0.1
-Release: 11
-%define rversion 4.0.1
+Version: 4.0.2
+Release: 2
+%define rversion 4.0.2
Source0: kdesdk-%rversion.tar.bz2
Source1: _upstream
Patch: 4_0_BRANCH.diff
@@ -477,6 +477,8 @@
/usr/include/kprofilemethod.h
%changelog
+* Wed Feb 27 2008 dmueller@suse.de
+- update to 4.0.2
* Fri Feb 15 2008 dmueller@suse.de
- update 4_0_BRANCH.diff
* Thu Jan 31 2008 dmueller@suse.de
++++++ 4_0_BRANCH.diff ++++++
--- /var/tmp/diff_new_pack.W21931/_old 2008-03-05 23:07:59.000000000 +0100
+++ /var/tmp/diff_new_pack.W21931/_new 2008-03-05 23:07:59.000000000 +0100
@@ -1,199 +1,7 @@
-package: kdesdk-4.0.1.tar.bz2
+package: kdesdk-4.0.2.tar.bz2
kdemod: kdesdk
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
-+current HEAD: 774998
-+svn di between /tags/KDE/4.0.1 and /branches/KDE//branches/KDE/4.0
---- kate/app/katemainwindow.h
-+++ kate/app/katemainwindow.h
-@@ -116,7 +116,7 @@
- bool showModOnDiskPrompt();
-
- public:
-- /*reimp*/ void readProperties(KConfigGroup config);
-+ /*reimp*/ void readProperties(const KConfigGroup& config);
- /*reimp*/ void saveProperties(KConfigGroup& config);
- /*reimp*/ void saveGlobalProperties( KConfig* sessionConfig );
-
---- kate/app/katemain.cpp
-+++ kate/app/katemain.cpp
-@@ -107,8 +107,6 @@
- if ( (args->isSet("use")) || (::getenv("KATE_PID") != 0))
- {
- // inialize the dbus stuff...
-- QCoreApplication *app = new QCoreApplication (argc, argv);
--
- // bus interface
- QDBusConnectionInterface *i = QDBusConnection::sessionBus().interface ();
-
-@@ -244,8 +242,6 @@
-
- return 0;
- }
--
-- delete app;
- }
-
- // construct the real kate app object ;)
---- kate/app/katemainwindow.cpp
-+++ kate/app/katemainwindow.cpp
-@@ -268,14 +268,14 @@
- actionCollection()->addAction(fileOpenRecent->objectName(), fileOpenRecent);
- fileOpenRecent->setWhatsThis(i18n("This lists files which you have opened recently, and allows you to easily open them again."));
-
-- a = static_cast(actionCollection()->addAction( "file_save_all" ));
-+ a = actionCollection()->addAction( "file_save_all" );
- a->setIcon( KIcon("document-save-all") );
- a->setText( i18n("Save A&ll") );
- a->setShortcut( QKeySequence(Qt::CTRL + Qt::Key_L) );
- connect( a, SIGNAL( triggered() ), KateDocManager::self(), SLOT( saveAll() ) );
- a->setWhatsThis(i18n("Save all open, modified documents to disk."));
-
-- a = static_cast(actionCollection()->addAction( "file_reload_all" ));
-+ a = actionCollection()->addAction( "file_reload_all" );
- a->setText( i18n("&Reload All") );
- connect( a, SIGNAL( triggered() ), KateDocManager::self(), SLOT( reloadAll() ) );
- a->setWhatsThis(i18n("Reload all open documents."));
-@@ -283,12 +283,12 @@
- actionCollection()->addAction( KStandardAction::Close, "file_close", m_viewManager, SLOT( slotDocumentClose() ) )
- ->setWhatsThis(i18n("Close the current document."));
-
-- a = static_cast(actionCollection()->addAction( "file_close_other" ));
-+ a = actionCollection()->addAction( "file_close_other" );
- a->setText( i18n( "Close Other" ) );
- connect( a, SIGNAL( triggered() ), this, SLOT( slotDocumentCloseOther() ) );
- a->setWhatsThis(i18n("Close other open documents."));
-
-- a = static_cast(actionCollection()->addAction( "file_close_all" ));
-+ a = actionCollection()->addAction( "file_close_all" );
- a->setText( i18n( "Clos&e All" ) );
- connect( a, SIGNAL( triggered() ), this, SLOT( slotDocumentCloseAll() ) );
- a->setWhatsThis(i18n("Close all open documents."));
-@@ -296,7 +296,7 @@
- actionCollection()->addAction( KStandardAction::Quit, "file_quit", this, SLOT( slotFileQuit() ) )
- ->setWhatsThis(i18n("Close this window"));
-
-- a = static_cast(actionCollection()->addAction( "view_new_view" ));
-+ a = actionCollection()->addAction( "view_new_view" );
- a->setIcon( KIcon("window-new") );
- a->setText( i18n("&New Window") );
- connect( a, SIGNAL( triggered() ), this, SLOT( newWindow() ) );
-@@ -312,11 +312,11 @@
- connect(documentOpenWith->menu(), SIGNAL(aboutToShow()), this, SLOT(mSlotFixOpenWithMenu()));
- connect(documentOpenWith->menu(), SIGNAL(triggered(QAction*)), this, SLOT(slotOpenWithMenuAction(QAction*)));
-
-- a = static_cast(actionCollection()->addAction(KStandardAction::KeyBindings, this, SLOT(editKeys())));
-+ a = actionCollection()->addAction(KStandardAction::KeyBindings, this, SLOT(editKeys()));
- a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments."));
-
-- a = static_cast(actionCollection()->addAction(KStandardAction::ConfigureToolbars, "set_configure_toolbars",
-- this, SLOT(slotEditToolbars())));
-+ a = actionCollection()->addAction(KStandardAction::ConfigureToolbars, "set_configure_toolbars",
-+ this, SLOT(slotEditToolbars()));
- a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s)."));
-
- QAction* settingsConfigure = actionCollection()->addAction(KStandardAction::Preferences, "settings_configure",
-@@ -329,16 +329,16 @@
-
- if (KatePluginManager::self()->pluginList().count() > 0)
- {
-- a = static_cast(actionCollection()->addAction( "help_plugins_contents" ));
-+ a = actionCollection()->addAction( "help_plugins_contents" );
- a->setText( i18n("&Plugins Handbook") );
- connect( a, SIGNAL( triggered() ), this, SLOT( pluginHelp() ) );
- a->setWhatsThis(i18n("This shows help files for various available plugins."));
- }
-
-- a = static_cast(actionCollection()->addAction( "help_about_editor" ));
-+ a = actionCollection()->addAction( "help_about_editor" );
- a->setText( i18n("&About Editor Component") );
- connect( a, SIGNAL( triggered() ), this, SLOT( aboutEditor() ) );
-- qobject_cast( a )->setGlobalShortcutAllowed(true);
-+ a->setGlobalShortcutAllowed(true);
-
- connect(m_viewManager, SIGNAL(viewChanged()), m_mainWindow, SIGNAL(viewChanged()));
- connect(m_viewManager, SIGNAL(viewChanged()), this, SLOT(slotWindowActivated()));
-@@ -347,27 +347,27 @@
- slotWindowActivated ();
-
- // session actions
-- a = static_cast(actionCollection()->addAction( "sessions_new" ));
-+ a = actionCollection()->addAction( "sessions_new" );
- a->setIcon( KIcon("document-new") );
- a->setText( i18nc("Menu entry Session->New", "&New") );
- connect( a, SIGNAL( triggered() ), KateSessionManager::self(), SLOT( sessionNew() ) );
-- a = static_cast(actionCollection()->addAction( "sessions_open" ));
-+ a = actionCollection()->addAction( "sessions_open" );
- a->setIcon( KIcon("document-open") );
- a->setText( i18n("&Open...") );
- connect( a, SIGNAL( triggered() ), KateSessionManager::self(), SLOT( sessionOpen() ) );
-- a = static_cast(actionCollection()->addAction( "sessions_save" ));
-+ a = actionCollection()->addAction( "sessions_save" );
- a->setIcon( KIcon("document-save") );
- a->setText( i18n("&Save") );
- connect( a, SIGNAL( triggered() ), KateSessionManager::self(), SLOT( sessionSave() ) );
-- a = static_cast(actionCollection()->addAction( "sessions_save_as" ));
-+ a = actionCollection()->addAction( "sessions_save_as" );
- a->setIcon( KIcon("document-save-as") );
- a->setText( i18n("Save &As...") );
- connect( a, SIGNAL( triggered() ), KateSessionManager::self(), SLOT( sessionSaveAs() ) );
-- a = static_cast(actionCollection()->addAction( "sessions_save_default" ));
-+ a = actionCollection()->addAction( "sessions_save_default" );
- a->setIcon( KIcon("document-save-as") );
- a->setText( i18n("Save As &Default...") );
- connect( a, SIGNAL( triggered() ), KateSessionManager::self(), SLOT( sessionSaveAsDefault() ) );
-- a = static_cast(actionCollection()->addAction( "sessions_manage" ));
-+ a = actionCollection()->addAction( "sessions_manage" );
- a->setIcon( KIcon("view-choose") );
- a->setText( i18n("&Manage...") );
- connect( a, SIGNAL( triggered() ), KateSessionManager::self(), SLOT( sessionManage() ) );
-@@ -873,12 +873,15 @@
- m_viewManager->saveViewConfiguration (config);
- }
-
--void KateMainWindow::readProperties(KConfigGroup config)
-+void KateMainWindow::readProperties(const KConfigGroup& config)
- {
-- startRestore(config.config(), config.name());
-+ // TODO startRestore should take a const KConfigBase*, or even just a const KConfigGroup&,
-+ // but this propagates down to interfaces/kate/plugin.h so all plugins have to be ported
-+ KConfigBase* configBase = const_cast(config.config());
-+ startRestore(configBase, config.name());
-
- // perhaps enable plugin guis
-- KatePluginManager::self()->enableAllPluginsGUI (this, config.config());
-+ KatePluginManager::self()->enableAllPluginsGUI (this, configBase);
-
- finishRestore ();
-
---- scripts/kdesvn-build
-+++ scripts/kdesvn-build
-@@ -3945,7 +3945,9 @@
- $temp .= "$_/";
-
- next if -e $temp;
-- return 0 if not mkdir ($temp);
-+ # Check again if the directory does not exist before failing, since this
-+ # function may be run concurrently in different processes.
-+ return 0 if not mkdir ($temp) and not -e $temp;
- }
-
- return 1;
---- kioslave/svn/svnhelper/subversion.desktop
-+++ kioslave/svn/svnhelper/subversion.desktop
-@@ -1,5 +1,6 @@
- [Desktop Entry]
- Encoding=UTF-8
-+Type=Service
- ServiceTypes=KonqPopupMenu/Plugin,inode/directory,all/all
- X-KDE-Submenu=Subversion
- X-KDE-Submenu[fa]=زیرنسخه
-
-Property changes on: .
-___________________________________________________________________
-Deleted: svn:mergeinfo
-Added: svn:externals
- +
-
-
++current HEAD: 779973
++svn di between /tags/KDE/4.0.2 and /branches/KDE//branches/KDE/4.0
++++++ kdesdk-4.0.1.tar.bz2 -> kdesdk-4.0.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.1/cervisia/logplainview.cpp new/kdesdk-4.0.2/cervisia/logplainview.cpp
--- old/kdesdk-4.0.1/cervisia/logplainview.cpp 2008-01-05 00:57:53.000000000 +0100
+++ new/kdesdk-4.0.2/cervisia/logplainview.cpp 2008-02-27 22:26:14.000000000 +0100
@@ -75,10 +75,17 @@
// add an empty line when we had tags or branches
if( !logInfo.m_tags.empty() )
insertHtml(lineBreak);
- insertHtml(lineBreak);
+ // seems to be superfluous with Qt 4.3
+ // insertHtml(lineBreak);
+
+ // workaround Qt bug (TT ID 166111)
+ const QTextBlockFormat blockFmt(textCursor().blockFormat());
// add horizontal line
- insertHtml(QLatin1String("<hr><br>"));
+ // looks strange but without pre the workaroud omits the line completely
+ insertHtml(QLatin1String("<hr><pre></pre><br>"));
+
+ textCursor().setBlockFormat(blockFmt);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.1/cervisia/version.h new/kdesdk-4.0.2/cervisia/version.h
--- old/kdesdk-4.0.1/cervisia/version.h 2008-01-31 00:54:57.000000000 +0100
+++ new/kdesdk-4.0.2/cervisia/version.h 2008-02-27 22:26:14.000000000 +0100
@@ -1,3 +1,3 @@
#ifndef CERVISIA_VERSION
-#define CERVISIA_VERSION "3.0.1"
+#define CERVISIA_VERSION "3.0.2"
#endif // CERVISIA_VERSION
Files old/kdesdk-4.0.1/doc/cervisia/index.cache.bz2 and new/kdesdk-4.0.2/doc/cervisia/index.cache.bz2 differ
Files old/kdesdk-4.0.1/doc/kapptemplate/index.cache.bz2 and new/kdesdk-4.0.2/doc/kapptemplate/index.cache.bz2 differ
Files old/kdesdk-4.0.1/doc/kate/index.cache.bz2 and new/kdesdk-4.0.2/doc/kate/index.cache.bz2 differ
Files old/kdesdk-4.0.1/doc/kate-plugins/index.cache.bz2 and new/kdesdk-4.0.2/doc/kate-plugins/index.cache.bz2 differ
Files old/kdesdk-4.0.1/doc/kbugbuster/index.cache.bz2 and new/kdesdk-4.0.2/doc/kbugbuster/index.cache.bz2 differ
Files old/kdesdk-4.0.1/doc/kcachegrind/index.cache.bz2 and new/kdesdk-4.0.2/doc/kcachegrind/index.cache.bz2 differ
Files old/kdesdk-4.0.1/doc/kompare/index.cache.bz2 and new/kdesdk-4.0.2/doc/kompare/index.cache.bz2 differ
Files old/kdesdk-4.0.1/doc/scripts/kdesvn-build/index.cache.bz2 and new/kdesdk-4.0.2/doc/scripts/kdesvn-build/index.cache.bz2 differ
Files old/kdesdk-4.0.1/doc/umbrello/index.cache.bz2 and new/kdesdk-4.0.2/doc/umbrello/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.1/kate/app/katemain.cpp new/kdesdk-4.0.2/kate/app/katemain.cpp
--- old/kdesdk-4.0.1/kate/app/katemain.cpp 2008-01-05 00:57:36.000000000 +0100
+++ new/kdesdk-4.0.2/kate/app/katemain.cpp 2008-02-27 12:58:21.000000000 +0100
@@ -107,8 +107,6 @@
if ( (args->isSet("use")) || (::getenv("KATE_PID") != 0))
{
// inialize the dbus stuff...
- QCoreApplication *app = new QCoreApplication (argc, argv);
-
// bus interface
QDBusConnectionInterface *i = QDBusConnection::sessionBus().interface ();
@@ -244,8 +242,6 @@
return 0;
}
-
- delete app;
}
// construct the real kate app object ;)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.1/kate/app/katemainwindow.cpp new/kdesdk-4.0.2/kate/app/katemainwindow.cpp
--- old/kdesdk-4.0.1/kate/app/katemainwindow.cpp 2008-01-31 00:54:54.000000000 +0100
+++ new/kdesdk-4.0.2/kate/app/katemainwindow.cpp 2008-02-27 12:58:21.000000000 +0100
@@ -268,14 +268,14 @@
actionCollection()->addAction(fileOpenRecent->objectName(), fileOpenRecent);
fileOpenRecent->setWhatsThis(i18n("This lists files which you have opened recently, and allows you to easily open them again."));
- a = static_cast(actionCollection()->addAction( "file_save_all" ));
+ a = actionCollection()->addAction( "file_save_all" );
a->setIcon( KIcon("document-save-all") );
a->setText( i18n("Save A&ll") );
a->setShortcut( QKeySequence(Qt::CTRL + Qt::Key_L) );
connect( a, SIGNAL( triggered() ), KateDocManager::self(), SLOT( saveAll() ) );
a->setWhatsThis(i18n("Save all open, modified documents to disk."));
- a = static_cast(actionCollection()->addAction( "file_reload_all" ));
+ a = actionCollection()->addAction( "file_reload_all" );
a->setText( i18n("&Reload All") );
connect( a, SIGNAL( triggered() ), KateDocManager::self(), SLOT( reloadAll() ) );
a->setWhatsThis(i18n("Reload all open documents."));
@@ -283,12 +283,12 @@
actionCollection()->addAction( KStandardAction::Close, "file_close", m_viewManager, SLOT( slotDocumentClose() ) )
->setWhatsThis(i18n("Close the current document."));
- a = static_cast(actionCollection()->addAction( "file_close_other" ));
+ a = actionCollection()->addAction( "file_close_other" );
a->setText( i18n( "Close Other" ) );
connect( a, SIGNAL( triggered() ), this, SLOT( slotDocumentCloseOther() ) );
a->setWhatsThis(i18n("Close other open documents."));
- a = static_cast(actionCollection()->addAction( "file_close_all" ));
+ a = actionCollection()->addAction( "file_close_all" );
a->setText( i18n( "Clos&e All" ) );
connect( a, SIGNAL( triggered() ), this, SLOT( slotDocumentCloseAll() ) );
a->setWhatsThis(i18n("Close all open documents."));
@@ -296,7 +296,7 @@
actionCollection()->addAction( KStandardAction::Quit, "file_quit", this, SLOT( slotFileQuit() ) )
->setWhatsThis(i18n("Close this window"));
- a = static_cast(actionCollection()->addAction( "view_new_view" ));
+ a = actionCollection()->addAction( "view_new_view" );
a->setIcon( KIcon("window-new") );
a->setText( i18n("&New Window") );
connect( a, SIGNAL( triggered() ), this, SLOT( newWindow() ) );
@@ -312,11 +312,11 @@
connect(documentOpenWith->menu(), SIGNAL(aboutToShow()), this, SLOT(mSlotFixOpenWithMenu()));
connect(documentOpenWith->menu(), SIGNAL(triggered(QAction*)), this, SLOT(slotOpenWithMenuAction(QAction*)));
- a = static_cast(actionCollection()->addAction(KStandardAction::KeyBindings, this, SLOT(editKeys())));
+ a = actionCollection()->addAction(KStandardAction::KeyBindings, this, SLOT(editKeys()));
a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments."));
- a = static_cast(actionCollection()->addAction(KStandardAction::ConfigureToolbars, "set_configure_toolbars",
- this, SLOT(slotEditToolbars())));
+ a = actionCollection()->addAction(KStandardAction::ConfigureToolbars, "set_configure_toolbars",
+ this, SLOT(slotEditToolbars()));
a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s)."));
QAction* settingsConfigure = actionCollection()->addAction(KStandardAction::Preferences, "settings_configure",
@@ -329,16 +329,16 @@
if (KatePluginManager::self()->pluginList().count() > 0)
{
- a = static_cast(actionCollection()->addAction( "help_plugins_contents" ));
+ a = actionCollection()->addAction( "help_plugins_contents" );
a->setText( i18n("&Plugins Handbook") );
connect( a, SIGNAL( triggered() ), this, SLOT( pluginHelp() ) );
a->setWhatsThis(i18n("This shows help files for various available plugins."));
}
- a = static_cast(actionCollection()->addAction( "help_about_editor" ));
+ a = actionCollection()->addAction( "help_about_editor" );
a->setText( i18n("&About Editor Component") );
connect( a, SIGNAL( triggered() ), this, SLOT( aboutEditor() ) );
- qobject_cast( a )->setGlobalShortcutAllowed(true);
+ a->setGlobalShortcutAllowed(true);
connect(m_viewManager, SIGNAL(viewChanged()), m_mainWindow, SIGNAL(viewChanged()));
connect(m_viewManager, SIGNAL(viewChanged()), this, SLOT(slotWindowActivated()));
@@ -347,27 +347,27 @@
slotWindowActivated ();
// session actions
- a = static_cast(actionCollection()->addAction( "sessions_new" ));
+ a = actionCollection()->addAction( "sessions_new" );
a->setIcon( KIcon("document-new") );
a->setText( i18nc("Menu entry Session->New", "&New") );
connect( a, SIGNAL( triggered() ), KateSessionManager::self(), SLOT( sessionNew() ) );
- a = static_cast(actionCollection()->addAction( "sessions_open" ));
+ a = actionCollection()->addAction( "sessions_open" );
a->setIcon( KIcon("document-open") );
a->setText( i18n("&Open...") );
connect( a, SIGNAL( triggered() ), KateSessionManager::self(), SLOT( sessionOpen() ) );
- a = static_cast(actionCollection()->addAction( "sessions_save" ));
+ a = actionCollection()->addAction( "sessions_save" );
a->setIcon( KIcon("document-save") );
a->setText( i18n("&Save") );
connect( a, SIGNAL( triggered() ), KateSessionManager::self(), SLOT( sessionSave() ) );
- a = static_cast(actionCollection()->addAction( "sessions_save_as" ));
+ a = actionCollection()->addAction( "sessions_save_as" );
a->setIcon( KIcon("document-save-as") );
a->setText( i18n("Save &As...") );
connect( a, SIGNAL( triggered() ), KateSessionManager::self(), SLOT( sessionSaveAs() ) );
- a = static_cast(actionCollection()->addAction( "sessions_save_default" ));
+ a = actionCollection()->addAction( "sessions_save_default" );
a->setIcon( KIcon("document-save-as") );
a->setText( i18n("Save As &Default...") );
connect( a, SIGNAL( triggered() ), KateSessionManager::self(), SLOT( sessionSaveAsDefault() ) );
- a = static_cast(actionCollection()->addAction( "sessions_manage" ));
+ a = actionCollection()->addAction( "sessions_manage" );
a->setIcon( KIcon("view-choose") );
a->setText( i18n("&Manage...") );
connect( a, SIGNAL( triggered() ), KateSessionManager::self(), SLOT( sessionManage() ) );
@@ -873,12 +873,15 @@
m_viewManager->saveViewConfiguration (config);
}
-void KateMainWindow::readProperties(KConfigGroup config)
+void KateMainWindow::readProperties(const KConfigGroup& config)
{
- startRestore(config.config(), config.name());
+ // TODO startRestore should take a const KConfigBase*, or even just a const KConfigGroup&,
+ // but this propagates down to interfaces/kate/plugin.h so all plugins have to be ported
+ KConfigBase* configBase = const_cast(config.config());
+ startRestore(configBase, config.name());
// perhaps enable plugin guis
- KatePluginManager::self()->enableAllPluginsGUI (this, config.config());
+ KatePluginManager::self()->enableAllPluginsGUI (this, configBase);
finishRestore ();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.1/kate/app/katemainwindow.h new/kdesdk-4.0.2/kate/app/katemainwindow.h
--- old/kdesdk-4.0.1/kate/app/katemainwindow.h 2008-01-05 00:57:36.000000000 +0100
+++ new/kdesdk-4.0.2/kate/app/katemainwindow.h 2008-02-27 12:58:21.000000000 +0100
@@ -116,7 +116,7 @@
bool showModOnDiskPrompt();
public:
- /*reimp*/ void readProperties(KConfigGroup config);
+ /*reimp*/ void readProperties(const KConfigGroup& config);
/*reimp*/ void saveProperties(KConfigGroup& config);
/*reimp*/ void saveGlobalProperties( KConfig* sessionConfig );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.1/kate/plugins/filebrowser/katefileselector.cpp new/kdesdk-4.0.2/kate/plugins/filebrowser/katefileselector.cpp
--- old/kdesdk-4.0.1/kate/plugins/filebrowser/katefileselector.cpp 2008-01-05 00:57:36.000000000 +0100
+++ new/kdesdk-4.0.2/kate/plugins/filebrowser/katefileselector.cpp 2008-02-27 12:58:21.000000000 +0100
@@ -300,6 +300,7 @@
KConfigGroup cgDir(config, name + ":dir");
dir->readConfig(cgDir);
+ dir->setView(KFile::Default);
KConfigGroup cg (config, name );
cmbPath->setUrls( cg.readPathEntry( "dir history", QStringList() ) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.1/kate/plugins/findinfiles/katefindinfiles.cpp new/kdesdk-4.0.2/kate/plugins/findinfiles/katefindinfiles.cpp
--- old/kdesdk-4.0.1/kate/plugins/findinfiles/katefindinfiles.cpp 2008-01-05 00:57:37.000000000 +0100
+++ new/kdesdk-4.0.2/kate/plugins/findinfiles/katefindinfiles.cpp 2008-02-27 12:58:21.000000000 +0100
@@ -33,7 +33,6 @@
#include
#include
-#include
#include
#include
#include
@@ -46,10 +45,6 @@
KateFindInFilesPlugin::KateFindInFilesPlugin( QObject* parent, const QStringList& ):
Kate::Plugin ( (Kate::Application*)parent )
{
- if (!KAuthorized::authorizeKAction("shell_access"))
- {
- KMessageBox::sorry(0, i18n ("You do not have enough karma to access a shell or terminal emulation"));
- }
}
Kate::PluginView *KateFindInFilesPlugin::createView (Kate::MainWindow *mainWindow)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.1/kate/plugins/findinfiles/kategrepdialog.cpp new/kdesdk-4.0.2/kate/plugins/findinfiles/kategrepdialog.cpp
--- old/kdesdk-4.0.1/kate/plugins/findinfiles/kategrepdialog.cpp 2008-01-05 00:57:37.000000000 +0100
+++ new/kdesdk-4.0.2/kate/plugins/findinfiles/kategrepdialog.cpp 2008-02-27 12:58:21.000000000 +0100
@@ -106,8 +106,8 @@
cmbPattern->installEventFilter( this );
cmbFiles->installEventFilter( this );
cmbDir->comboBox()->installEventFilter( this );
-
-
+
+
// add close tab button to tabwidget
btnCloseTab = new QToolButton( lbResult );
btnCloseTab->setEnabled(false);
@@ -116,7 +116,7 @@
btnCloseTab->adjustSize();
connect(btnCloseTab, SIGNAL(clicked()), SLOT(slotCloseResultTab()));
btnCloseTab->hide();
-
+
lbResult->setCornerWidget( btnCloseTab, Qt::BottomRight );
lbResult->setTabCloseActivatePrevious (true);
connect(lbResult, SIGNAL(closeRequest( QWidget * )), this,
@@ -216,6 +216,7 @@
// do it ;)
m_mw->activeView()->setCursorPosition( KTextEditor::Cursor (linenumber, column) );
+ m_mw->activeView()->setFocus();
}
void KateGrepDialog::slotSearch()
@@ -249,18 +250,18 @@
btnClear->setEnabled( false );
btnSearch->setGuiItem( KStandardGuiItem::cancel() );
-
+
// add a tab for the new search
QTreeWidget* w = new QTreeWidget();
connect( w, SIGNAL(itemActivated(QTreeWidgetItem *, int)),
SLOT(itemSelected(QTreeWidgetItem *, int)) );
-
+
// result view, list all matches....
QStringList headers;
headers << i18n("File") << i18n("Line") << i18n("Text");
w->setHeaderLabels(headers);
w->setIndentation(0);
-
+
lbResult->insertTab( w, QIcon(SmallIcon ("system-search")),
cmbPattern->currentText(), 0);
lbResult->setCurrentWidget (w);
@@ -381,10 +382,10 @@
void KateGrepDialog::slotCloseResultTab(QWidget* widget)
{
lbResult->removePage (widget);
-
+
widget->hide();
delete widget;
-
+
if (lbResult->count() == 0)
{
btnCloseTab->setEnabled(false);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.1/kate/plugins/findinfiles/kategrepthread.cpp new/kdesdk-4.0.2/kate/plugins/findinfiles/kategrepthread.cpp
--- old/kdesdk-4.0.1/kate/plugins/findinfiles/kategrepthread.cpp 2008-01-05 00:57:37.000000000 +0100
+++ new/kdesdk-4.0.2/kate/plugins/findinfiles/kategrepthread.cpp 2008-02-27 12:58:21.000000000 +0100
@@ -50,12 +50,16 @@
if (!currentDir.isReadable ())
continue;
- // append all dirs to the workqueue
- QFileInfoList currentSubDirs = currentDir.entryInfoList (QDir::Dirs | QDir::NoSymLinks | QDir::NoDotAndDotDot | QDir::Readable);
-
- // append them to the workqueue, if readable
- for (int i = 0; i < currentSubDirs.size(); ++i)
- m_workQueue << currentSubDirs.at(i).absoluteFilePath ();
+ // only add subdirs to worklist if we should do recursive search
+ if (m_recursive)
+ {
+ // append all dirs to the workqueue
+ QFileInfoList currentSubDirs = currentDir.entryInfoList (QDir::Dirs | QDir::NoSymLinks | QDir::NoDotAndDotDot | QDir::Readable);
+
+ // append them to the workqueue, if readable
+ for (int i = 0; i < currentSubDirs.size(); ++i)
+ m_workQueue << currentSubDirs.at(i).absoluteFilePath ();
+ }
// work with all files in this dir..., use wildcards for them...
QFileInfoList currentFiles = currentDir.entryInfoList (m_fileWildcards, QDir::Files | QDir::NoSymLinks | QDir::NoDotAndDotDot | QDir::Readable);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.1/kioslave/svn/svnhelper/subversion.desktop new/kdesdk-4.0.2/kioslave/svn/svnhelper/subversion.desktop
--- old/kdesdk-4.0.1/kioslave/svn/svnhelper/subversion.desktop 2008-01-31 00:54:57.000000000 +0100
+++ new/kdesdk-4.0.2/kioslave/svn/svnhelper/subversion.desktop 2008-02-27 12:58:22.000000000 +0100
@@ -1,5 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
+Type=Service
ServiceTypes=KonqPopupMenu/Plugin,inode/directory,all/all
X-KDE-Submenu=Subversion
X-KDE-Submenu[fa]=زیرنسخه
@@ -9,7 +10,10 @@
#X-KDE-ShowIfDcopCall=kded ksvnd anyValidWorkingCopy(KUrl::List)
#Return type of below is a QStringList with a list of Actions which is appended to the Actions above
-X-KDE-GetActionMenu=kded ksvnd getActionMenu(KUrl::List)
+#X-KDE-GetActionMenu=kded ksvnd getActionMenu(KUrl::List)
+X-KDE-GetActionMenu=org.kde.kded /modules/ksvnd org.kde.ksvnd getActionMenu
+Actions=Add;Delete;Revert;Rename;Checkout;Switch;Merge;Blame;CreatePatch;Diff;
+# Laurent import/export action is not implemented => Readd "Export" or "Import" when implemented
[Desktop Action Add]
Name=Add to Repository
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.1/kioslave/svn/svnhelper/subversion_toplevel.desktop new/kdesdk-4.0.2/kioslave/svn/svnhelper/subversion_toplevel.desktop
--- old/kdesdk-4.0.1/kioslave/svn/svnhelper/subversion_toplevel.desktop 2008-01-31 00:54:57.000000000 +0100
+++ new/kdesdk-4.0.2/kioslave/svn/svnhelper/subversion_toplevel.desktop 2008-02-27 12:58:22.000000000 +0100
@@ -6,6 +6,8 @@
X-KDE-GetActionMenu=org.kde.kded /modules/ksvnd org.kde.ksvnd getTopLevelActionMenu
+Actions=Update;Commit;
+
[Desktop Action Update]
Name=SVN Update
Name[ca]=Actualitza SVN
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.1/scripts/kde-devel-gdb new/kdesdk-4.0.2/scripts/kde-devel-gdb
--- old/kdesdk-4.0.1/scripts/kde-devel-gdb 2008-01-05 00:57:43.000000000 +0100
+++ new/kdesdk-4.0.2/scripts/kde-devel-gdb 2008-02-27 12:58:22.000000000 +0100
@@ -9,7 +9,11 @@
set print static-members off
# Show the real classname of object instances - e.g. (Kded *) 0x8073440 instead of (class QObject *) 0x8073440
-set print object
+# Turned it off again, because it breaks too often:
+# (gdb) p this->_autoFree
+# Cannot access memory at address 0x0
+# Without it: $5 = 0 '\0'
+#set print object
define printqstring
printqstringdata $arg0.d
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.1/scripts/kdesvn-build new/kdesdk-4.0.2/scripts/kdesvn-build
--- old/kdesdk-4.0.1/scripts/kdesvn-build 2008-01-31 00:54:56.000000000 +0100
+++ new/kdesdk-4.0.2/scripts/kdesvn-build 2008-02-27 12:58:21.000000000 +0100
@@ -3945,7 +3945,9 @@
$temp .= "$_/";
next if -e $temp;
- return 0 if not mkdir ($temp);
+ # Check again if the directory does not exist before failing, since this
+ # function may be run concurrently in different processes.
+ return 0 if not mkdir ($temp) and not -e $temp;
}
return 1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdesdk-4.0.1/scripts/makeobj new/kdesdk-4.0.2/scripts/makeobj
--- old/kdesdk-4.0.1/scripts/makeobj 2008-01-05 00:57:42.000000000 +0100
+++ new/kdesdk-4.0.2/scripts/makeobj 2008-02-27 12:58:22.000000000 +0100
@@ -38,7 +38,7 @@
esac
done
-if test "$dir" = "." && test ! -f CMakeLists.txt && test -f ../CMakeLists.txt; then
+if test "$dir" = "." && test ! -f CMakeLists.txt && test ! -f Makefile && test -f ../CMakeLists.txt; then
cd ..
fi
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org