Mailinglist Archive: opensuse-commit (875 mails)

< Previous Next >
commit kdeutils4
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Fri, 18 Jul 2008 00:29:03 +0200
  • Message-id: <20080717222904.5292D678178@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package kdeutils4
checked in at Fri Jul 18 00:29:03 CEST 2008.


--------
--- KDE/kdeutils4/kdeutils4.changes 2008-07-04 18:56:46.000000000 +0200
+++ kdeutils4/kdeutils4.changes 2008-07-11 12:38:24.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Jul 11 12:38:19 CEST 2008 - dmueller@xxxxxxx
+
+- update to 4.0.98
+
+-------------------------------------------------------------------



Old:
----
kdeutils-4.0.85.tar.bz2

New:
----
kdeutils-4.0.98.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdeutils4.spec ++++++
--- /var/tmp/diff_new_pack.B14360/_old 2008-07-18 00:27:56.000000000 +0200
+++ /var/tmp/diff_new_pack.B14360/_new 2008-07-18 00:27:56.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdeutils4 (Version 4.0.85)
+# spec file for package kdeutils4 (Version 4.0.98)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,14 +16,12 @@
%if %suse_version > 1020
BuildRequires: libarchive-devel
%endif
-%if 0
-BuildRequires: xmms-devel
-%endif
+BuildRequires: python-cups python-kde4
License: GPL v2 or later
Group: Productivity/Other
Summary: Base Package of KDE Utility Programs
Url: http://www.kde.org
-Version: 4.0.85
+Version: 4.0.98
Release: 1
Source0: kdeutils-%version.tar.bz2
Source1: _upstream
@@ -429,8 +427,15 @@
%files -f filelists/exclude
%defattr(-,root,root)
%doc AUTHORS COPYING COPYING.DOC README
+%ifnarch x86_64 ppc64 s390x mips64 sparc64
+/usr/bin/printer-applet
+/usr/share/autostart/printer-applet.desktop
+/usr/share/kde4/apps/printer-applet
+%endif

%changelog
+* Fri Jul 11 2008 dmueller@xxxxxxx
+- update to 4.0.98
* Fri Jul 04 2008 dmueller@xxxxxxx
- update to 4.0.85
* Tue Jul 01 2008 stbinner@xxxxxxx

++++++ kdeutils-4.0.85.tar.bz2 -> kdeutils-4.0.98.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/kdeutils-4.0.85/ark/plugins/rarplugin/kerfuffle_rar.desktop
new/kdeutils-4.0.98/ark/plugins/rarplugin/kerfuffle_rar.desktop
--- old/kdeutils-4.0.85/ark/plugins/rarplugin/kerfuffle_rar.desktop
2008-06-25 09:59:12.000000000 +0200
+++ new/kdeutils-4.0.98/ark/plugins/rarplugin/kerfuffle_rar.desktop
2008-07-08 11:57:51.000000000 +0200
@@ -38,4 +38,4 @@
Comment[x-test]=xxrar plugin for Kerfufflexx
Comment[zh_CN]=Kerfuffle 的 rar 插件
Comment[zh_TW]=Kerfuffle 的 rar 外掛程式
-MimeType=application/rar;application/x-rar
+MimeType=application/rar;application/x-rar;
Files old/kdeutils-4.0.85/doc/ark/index.cache.bz2 and
new/kdeutils-4.0.98/doc/ark/index.cache.bz2 differ
Files old/kdeutils-4.0.85/doc/kcalc/index.cache.bz2 and
new/kdeutils-4.0.98/doc/kcalc/index.cache.bz2 differ
Files old/kdeutils-4.0.85/doc/kcharselect/index.cache.bz2 and
new/kdeutils-4.0.98/doc/kcharselect/index.cache.bz2 differ
Files old/kdeutils-4.0.85/doc/kdf/index.cache.bz2 and
new/kdeutils-4.0.98/doc/kdf/index.cache.bz2 differ
Files old/kdeutils-4.0.85/doc/kfloppy/index.cache.bz2 and
new/kdeutils-4.0.98/doc/kfloppy/index.cache.bz2 differ
Files old/kdeutils-4.0.85/doc/kgpg/index.cache.bz2 and
new/kdeutils-4.0.98/doc/kgpg/index.cache.bz2 differ
Files old/kdeutils-4.0.85/doc/ktimer/index.cache.bz2 and
new/kdeutils-4.0.98/doc/ktimer/index.cache.bz2 differ
Files old/kdeutils-4.0.85/doc/kwallet/index.cache.bz2 and
new/kdeutils-4.0.98/doc/kwallet/index.cache.bz2 differ
Files old/kdeutils-4.0.85/doc/okteta/index.cache.bz2 and
new/kdeutils-4.0.98/doc/okteta/index.cache.bz2 differ
Files old/kdeutils-4.0.85/doc/superkaramba/index.cache.bz2 and
new/kdeutils-4.0.98/doc/superkaramba/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeutils-4.0.85/kcalc/Messages.sh
new/kdeutils-4.0.98/kcalc/Messages.sh
--- old/kdeutils-4.0.85/kcalc/Messages.sh 2008-01-05 00:53:30.000000000
+0100
+++ new/kdeutils-4.0.98/kcalc/Messages.sh 2008-07-08 11:57:51.000000000
+0200
@@ -1,2 +1,4 @@
#! /bin/sh
+$EXTRACTATTR --attr=constant,name scienceconstants.xml >>rc.cpp ||exit 11
$XGETTEXT *.cpp -o $podir/kcalc.pot
+rm -f rc.cpp
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeutils-4.0.85/kgpg/core/emailvalidator.cpp
new/kdeutils-4.0.98/kgpg/core/emailvalidator.cpp
--- old/kdeutils-4.0.85/kgpg/core/emailvalidator.cpp 2008-01-05
00:53:24.000000000 +0100
+++ new/kdeutils-4.0.98/kgpg/core/emailvalidator.cpp 2008-07-08
11:57:51.000000000 +0200
@@ -28,8 +28,8 @@
QValidator::State EmailValidator::validate(QString &input, int &) const
{
static QString pattern = "^[a-z][a-z|0-9|]*([_][a-z|0-9]+)*([.][a-z|"
-
"0-9]+([_][a-z|0-9]+)*)?@[a-z][a-z|0-9|]*\\.([a-z]"
- "[a-z|0-9]*(\\.[a-z][a-z|0-9]*)?)$";
+
"0-9]+([_][a-z|0-9]+)*)?@[a-z][a-z|0-9|-]*\\.([a-z]"
+ "[a-z|0-9|-]*(\\.[a-z][a-z|0-9|-]*)?)$";

static QRegExp regexp(pattern, Qt::CaseInsensitive);

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeutils-4.0.85/kgpg/keyservers.cpp
new/kdeutils-4.0.98/kgpg/keyservers.cpp
--- old/kdeutils-4.0.85/kgpg/keyservers.cpp 2008-05-29 13:18:38.000000000
+0200
+++ new/kdeutils-4.0.98/kgpg/keyservers.cpp 2008-07-08 11:57:51.000000000
+0200
@@ -314,6 +314,7 @@
delete m_searchproc;
m_searchproc = NULL;
}
+ page->Buttonsearch->setEnabled(true);

if (m_dialogserver)
{
@@ -362,7 +363,7 @@
if (m_kitem != NULL)
CreateUidEntry();

- delete m_searchproc;
+ m_searchproc->deleteLater();
m_searchproc = NULL;
page->Buttonsearch->setEnabled(true);
QString nb;
@@ -387,7 +388,7 @@
void KeyServer::slotTextChanged(const QString &text)
{
page->Buttonimport->setEnabled(!text.isEmpty());
- page->Buttonsearch->setEnabled(!text.isEmpty());
+ page->Buttonsearch->setEnabled(!text.isEmpty() && (m_searchproc == NULL));
}

void KeyServer::slotSetExportAttribute(const QString *state)
@@ -482,7 +483,8 @@
delete m_searchproc;
m_searchproc = NULL;
}
- m_dialogserver->close();
+ m_dialogserver->close();
+ page->Buttonsearch->setEnabled(true);
}

void KeyServer::slotSetKeyserver(const QString &server)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeutils-4.0.85/kgpg/main.cpp
new/kdeutils-4.0.98/kgpg/main.cpp
--- old/kdeutils-4.0.85/kgpg/main.cpp 2008-05-21 10:32:40.000000000 +0200
+++ new/kdeutils-4.0.98/kgpg/main.cpp 2008-07-09 15:28:22.000000000 +0200
@@ -27,7 +27,7 @@
static const char description[] =
I18N_NOOP("KGpg - simple gui for gpg\n\nKGpg was designed to make gpg
very easy to use.\nI tried to make it as secure as possible.\nHope you enjoy
it.");

-static const char version[] = "1.9.2";
+static const char version[] = "1.9.3";

int main(int argc, char *argv[])
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeutils-4.0.85/okteta/gui/helper.h
new/kdeutils-4.0.98/okteta/gui/helper.h
--- old/kdeutils-4.0.85/okteta/gui/helper.h 2008-07-03 07:05:14.000000000
+0200
+++ new/kdeutils-4.0.98/okteta/gui/helper.h 2008-07-08 11:57:50.000000000
+0200
@@ -41,7 +41,7 @@
static inline KColorScheme::ForegroundRole foregroundRoleForChar( const
KHECore::KChar byteChar )
{
return byteChar.isUndefined() ? KColorScheme::NegativeText :
- byteChar.isPunct() ? KColorScheme::LinkText :
+ byteChar.isPunct() ? KColorScheme::InactiveText :
byteChar.isPrint() ? KColorScheme::NormalText :
KColorScheme::ActiveText;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeutils-4.0.85/okteta/gui/kbytearrayview.cpp
new/kdeutils-4.0.98/okteta/gui/kbytearrayview.cpp
--- old/kdeutils-4.0.85/okteta/gui/kbytearrayview.cpp 2008-07-03
07:05:14.000000000 +0200
+++ new/kdeutils-4.0.98/okteta/gui/kbytearrayview.cpp 2008-07-08
11:57:50.000000000 +0200
@@ -1185,7 +1185,7 @@
}
}

-void KByteArrayView::showBufferColumns( int newColumns )
+void KByteArrayView::setVisibleByteArrayColumns( int newColumns )
{
const int oldColumns = visibleBufferColumns();

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeutils-4.0.85/okteta/gui/kbytearrayview.h
new/kdeutils-4.0.98/okteta/gui/kbytearrayview.h
--- old/kdeutils-4.0.85/okteta/gui/kbytearrayview.h 2008-07-03
07:05:14.000000000 +0200
+++ new/kdeutils-4.0.98/okteta/gui/kbytearrayview.h 2008-07-08
11:57:50.000000000 +0200
@@ -106,7 +106,7 @@
Q_PROPERTY( KResizeStyle ResizeStyle READ resizeStyle WRITE setResizeStyle )
Q_PROPERTY( int StartOffset READ startOffset WRITE setStartOffset )
Q_PROPERTY( int FirstLineOffset READ firstLineOffset WRITE
setFirstLineOffset )
- Q_PROPERTY( int VisibleBufferColumns READ visibleBufferColumns WRITE
showBufferColumns )
+ Q_PROPERTY( int VisibleBufferColumns READ visibleBufferColumns WRITE
setVisibleByteArrayColumns )
Q_PROPERTY( bool ByteTypeColored READ isByteTypeColored WRITE
setByteTypeColored )
// value column
Q_PROPERTY( KCoding Coding READ coding WRITE setCoding )
@@ -246,7 +246,7 @@
/** switches the Offset column on/off */
void toggleOffsetColumn( bool Visible );
/** */
- void showBufferColumns( int Columns );
+ void setVisibleByteArrayColumns( int Columns );
/** scrolls the view as much as needed to have the cursor fully visible */
void ensureCursorVisible();

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/kdeutils-4.0.85/okteta/parts/kpart/browserextension.cpp
new/kdeutils-4.0.98/okteta/parts/kpart/browserextension.cpp
--- old/kdeutils-4.0.85/okteta/parts/kpart/browserextension.cpp 2008-04-30
15:58:17.000000000 +0200
+++ new/kdeutils-4.0.98/okteta/parts/kpart/browserextension.cpp 2008-07-08
11:57:51.000000000 +0200
@@ -86,7 +86,7 @@
KHEUI::KByteArrayView *view = part->view;

view->toggleOffsetColumn( offsetColumnVisible );
- view->showBufferColumns( visibleBufferColumns );
+ view->setVisibleByteArrayColumns( visibleBufferColumns );
view->setResizeStyle( (KHEUI::KByteArrayView::KResizeStyle)resizeStyle );
view->setCoding( (KHEUI::KByteArrayView::KCoding)coding );
view->setEncoding( encodingName );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeutils-4.0.85/okteta/parts/kpart/part.cpp
new/kdeutils-4.0.98/okteta/parts/kpart/part.cpp
--- old/kdeutils-4.0.85/okteta/parts/kpart/part.cpp 2008-04-18
09:21:22.000000000 +0200
+++ new/kdeutils-4.0.98/okteta/parts/kpart/part.cpp 2008-07-08
11:57:51.000000000 +0200
@@ -208,7 +208,7 @@

void OktetaPart::onToggleValueCharColumns( int VisibleColumns)
{
- view->showBufferColumns( VisibleColumns+1 );
+ view->setVisibleByteArrayColumns( VisibleColumns+1 );
}

OktetaPart::~OktetaPart() {}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/kdeutils-4.0.85/okteta/program/libkakao/controllers/io/copyas/copyascontroller.cpp

new/kdeutils-4.0.98/okteta/program/libkakao/controllers/io/copyas/copyascontroller.cpp
---
old/kdeutils-4.0.85/okteta/program/libkakao/controllers/io/copyas/copyascontroller.cpp
2008-05-21 10:32:39.000000000 +0200
+++
new/kdeutils-4.0.98/okteta/program/libkakao/controllers/io/copyas/copyascontroller.cpp
2008-07-08 11:57:50.000000000 +0200
@@ -26,6 +26,7 @@
#include <kidataselectable.h>
#include <kabstractview.h>
// Kakao core
+#include <modelstreamencodethread.h>
#include <modelcodecmanager.h>
#include <kdocumentmanager.h>
#include <abstractmodelstreamencoder.h>
@@ -42,6 +43,7 @@
#include <QtGui/QClipboard>
#include <QtGui/QApplication>

+
static const char CopyAsActionListId[] = "copy_as_list";

CopyAsController::CopyAsController( KDocumentManager *documentManager,
KXmlGuiWindow *window )
@@ -110,6 +112,8 @@

void CopyAsController::onActionTriggered( QAction *action )
{
+ QApplication::setOverrideCursor( Qt::WaitCursor );
+
AbstractModelStreamEncoder *encoder =
action->data().value<AbstractModelStreamEncoder *>();

const AbstractModelSelection *selection = mSelectionControl->selection();
@@ -118,10 +122,19 @@
QBuffer exportDataBuffer( &exportData );
exportDataBuffer.open( QIODevice::WriteOnly );

- encoder->encodeToStream( &exportDataBuffer, mView, selection );
+ ModelStreamEncodeThread *encodeThread =
+ new ModelStreamEncodeThread( this, &exportDataBuffer, mView,
selection, encoder );
+ encodeThread->start();
+ while( !encodeThread->wait(100) )
+ QApplication::processEvents( QEventLoop::ExcludeUserInputEvents |
QEventLoop::ExcludeSocketNotifiers, 100 );
+
+ delete encodeThread;
+
exportDataBuffer.close();

QMimeData *mimeData = new QMimeData;
mimeData->setData( encoder->remoteMimeType(), exportData );
QApplication::clipboard()->setMimeData( mimeData, QClipboard::Clipboard );
+
+ QApplication::restoreOverrideCursor();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/kdeutils-4.0.85/okteta/program/libkakao/core/CMakeLists.txt
new/kdeutils-4.0.98/okteta/program/libkakao/core/CMakeLists.txt
--- old/kdeutils-4.0.85/okteta/program/libkakao/core/CMakeLists.txt
2008-07-03 07:05:14.000000000 +0200
+++ new/kdeutils-4.0.98/okteta/program/libkakao/core/CMakeLists.txt
2008-07-08 11:57:51.000000000 +0200
@@ -30,7 +30,7 @@
io/abstractexportjob.cpp
io/abstractfilesystemexportjob.cpp
io/abstractmodelexporter.cpp
- io/modelencoderfilesystemexportthread.cpp
+ io/modelstreamencodethread.cpp
io/modelencoderfilesystemexportjob.cpp
io/modelencoderfilesystemexporter.cpp
io/kabstractdocumentsynchronizer.cpp
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/kdeutils-4.0.85/okteta/program/libkakao/core/io/abstractfilesystemsynctoremotejob.cpp

new/kdeutils-4.0.98/okteta/program/libkakao/core/io/abstractfilesystemsynctoremotejob.cpp
---
old/kdeutils-4.0.85/okteta/program/libkakao/core/io/abstractfilesystemsynctoremotejob.cpp
2008-07-03 07:05:14.000000000 +0200
+++
new/kdeutils-4.0.98/okteta/program/libkakao/core/io/abstractfilesystemsynctoremotejob.cpp
2008-07-08 11:57:51.000000000 +0200
@@ -56,7 +56,7 @@
};

AbstractFileSystemSyncToRemoteJob::Private::Private(
KAbstractDocumentFileSystemSynchronizer *synchronizer )
- : mSynchronizer( synchronizer )
+ : mSynchronizer( synchronizer ), mTemporaryFile( 0 )
{}

inline KUrl AbstractFileSystemSyncToRemoteJob::Private::url()
const { return mSynchronizer->url(); }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/kdeutils-4.0.85/okteta/program/libkakao/core/io/modelencoderfilesystemexportjob.cpp

new/kdeutils-4.0.98/okteta/program/libkakao/core/io/modelencoderfilesystemexportjob.cpp
---
old/kdeutils-4.0.85/okteta/program/libkakao/core/io/modelencoderfilesystemexportjob.cpp
2008-07-03 07:05:14.000000000 +0200
+++
new/kdeutils-4.0.98/okteta/program/libkakao/core/io/modelencoderfilesystemexportjob.cpp
2008-07-08 11:57:51.000000000 +0200
@@ -23,9 +23,10 @@
#include "modelencoderfilesystemexportjob.h"

// lib
-#include "modelencoderfilesystemexportthread.h"
+#include "modelstreamencodethread.h"
// Qt
#include <QtGui/QApplication>
+#include <QtCore/QFile>


class ModelEncoderFileSystemExportJob::Private
@@ -58,8 +59,15 @@

void ModelEncoderFileSystemExportJob::startExportToFile()
{
- ModelEncoderFileSystemExportThread *exportThread =
- new ModelEncoderFileSystemExportThread( this, model(), selection(),
workFilePath(), d->encoder() );
+ QFile file( workFilePath() );
+ if( !file.open(QIODevice::WriteOnly) )
+ {
+ completeExport( false );
+ return;
+ }
+
+ ModelStreamEncodeThread *exportThread =
+ new ModelStreamEncodeThread( this, &file, model(), selection(),
d->encoder() );
exportThread->start();
while( !exportThread->wait(100) )
QApplication::processEvents( QEventLoop::ExcludeUserInputEvents |
QEventLoop::ExcludeSocketNotifiers, 100 );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/kdeutils-4.0.85/okteta/program/libkakao/core/io/modelencoderfilesystemexportthread.cpp

new/kdeutils-4.0.98/okteta/program/libkakao/core/io/modelencoderfilesystemexportthread.cpp
---
old/kdeutils-4.0.85/okteta/program/libkakao/core/io/modelencoderfilesystemexportthread.cpp
2008-07-03 07:05:14.000000000 +0200
+++
new/kdeutils-4.0.98/okteta/program/libkakao/core/io/modelencoderfilesystemexportthread.cpp
1970-01-01 01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
-/*
- This file is part of the Okteta Kakao module, part of the KDE project.
-
- Copyright 2008 Friedrich W. H. Kossebau <kossebau@xxxxxxx>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) version 3, or any
- later version accepted by the membership of KDE e.V. (or its
- successor approved by the membership of KDE e.V.), which shall
- act as a proxy defined in Section 6 of version 3 of the license.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library. If not, see
<http://www.gnu.org/licenses/>.
-*/
-
-#include "modelencoderfilesystemexportthread.h"
-
-// lib
-#include "abstractmodelstreamencoder.h"
-// Qt
-#include <QtCore/QDataStream>
-#include <QtCore/QFile>
-#include <QtCore/QString>
-
-
-void ModelEncoderFileSystemExportThread::run()
-{
- QFile file( mFilePath );
- file.open( QIODevice::WriteOnly );
-
- mSuccess = mEncoder->encodeToStream( &file, mModel, mSelection );
-
- emit modelExported( mSuccess );
-}
-
-ModelEncoderFileSystemExportThread::~ModelEncoderFileSystemExportThread() {}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/kdeutils-4.0.85/okteta/program/libkakao/core/io/modelencoderfilesystemexportthread.h

new/kdeutils-4.0.98/okteta/program/libkakao/core/io/modelencoderfilesystemexportthread.h
---
old/kdeutils-4.0.85/okteta/program/libkakao/core/io/modelencoderfilesystemexportthread.h
2008-07-03 07:05:14.000000000 +0200
+++
new/kdeutils-4.0.98/okteta/program/libkakao/core/io/modelencoderfilesystemexportthread.h
1970-01-01 01:00:00.000000000 +0100
@@ -1,72 +0,0 @@
-/*
- This file is part of the Okteta Kakao module, part of the KDE project.
-
- Copyright 2008 Friedrich W. H. Kossebau <kossebau@xxxxxxx>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) version 3, or any
- later version accepted by the membership of KDE e.V. (or its
- successor approved by the membership of KDE e.V.), which shall
- act as a proxy defined in Section 6 of version 3 of the license.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library. If not, see
<http://www.gnu.org/licenses/>.
-*/
-
-#ifndef MODELENCODERFILESYSTEMEXPORTTHREAD_H
-#define MODELENCODERFILESYSTEMEXPORTTHREAD_H
-
-// Qt
-#include <QtCore/QThread>
-
-class AbstractModelStreamEncoder;
-class AbstractModel;
-class AbstractModelSelection;
-class QString;
-
-// TODO: instead of doubling all data just read them from the job?
-class ModelEncoderFileSystemExportThread : public QThread
-{
- Q_OBJECT
- public:
- ModelEncoderFileSystemExportThread( QObject *parent,
- AbstractModel *model, const
AbstractModelSelection *selection,
- const QString &filePath,
AbstractModelStreamEncoder *encoder );
- virtual ~ModelEncoderFileSystemExportThread();
-
- public: // QThread API
- virtual void run();
-
- public:
- bool success() const;
-
- Q_SIGNALS:
- void modelExported( bool success );
-
- protected:
- AbstractModel *mModel;
- const AbstractModelSelection *mSelection;
- const QString mFilePath;
- AbstractModelStreamEncoder *mEncoder;
-
- bool mSuccess;
-};
-
-inline ModelEncoderFileSystemExportThread::ModelEncoderFileSystemExportThread(
QObject *parent,
- AbstractModel *model, const AbstractModelSelection *selection,
- const QString &filePath, AbstractModelStreamEncoder *encoder )
- : QThread( parent ),
- mModel( model ), mSelection( selection ), mFilePath( filePath ), mEncoder(
encoder ),
- mSuccess( false )
-{}
-
-inline bool ModelEncoderFileSystemExportThread::success() const { return
mSuccess; }
-
-#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/kdeutils-4.0.85/okteta/program/libkakao/core/io/modelstreamencodethread.cpp
new/kdeutils-4.0.98/okteta/program/libkakao/core/io/modelstreamencodethread.cpp
---
old/kdeutils-4.0.85/okteta/program/libkakao/core/io/modelstreamencodethread.cpp
1970-01-01 01:00:00.000000000 +0100
+++
new/kdeutils-4.0.98/okteta/program/libkakao/core/io/modelstreamencodethread.cpp
2008-07-08 11:57:51.000000000 +0200
@@ -0,0 +1,36 @@
+/*
+ This file is part of the Okteta Kakao module, part of the KDE project.
+
+ Copyright 2008 Friedrich W. H. Kossebau <kossebau@xxxxxxx>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see
<http://www.gnu.org/licenses/>.
+*/
+
+#include "modelstreamencodethread.h"
+
+// lib
+#include "abstractmodelstreamencoder.h"
+
+
+void ModelStreamEncodeThread::run()
+{
+ mSuccess = mEncoder->encodeToStream( mIODevice, mModel, mSelection );
+
+ emit modelExported( mSuccess );
+}
+
+ModelStreamEncodeThread::~ModelStreamEncodeThread() {}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/kdeutils-4.0.85/okteta/program/libkakao/core/io/modelstreamencodethread.h
new/kdeutils-4.0.98/okteta/program/libkakao/core/io/modelstreamencodethread.h
---
old/kdeutils-4.0.85/okteta/program/libkakao/core/io/modelstreamencodethread.h
1970-01-01 01:00:00.000000000 +0100
+++
new/kdeutils-4.0.98/okteta/program/libkakao/core/io/modelstreamencodethread.h
2008-07-08 11:57:51.000000000 +0200
@@ -0,0 +1,74 @@
+/*
+ This file is part of the Okteta Kakao module, part of the KDE project.
+
+ Copyright 2008 Friedrich W. H. Kossebau <kossebau@xxxxxxx>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see
<http://www.gnu.org/licenses/>.
+*/
+
+#ifndef MODELSTREAMENCODETHREAD_U
+#define MODELSTREAMENCODETHREAD_U
+
+// Qt
+#include <QtCore/QThread>
+
+class AbstractModelStreamEncoder;
+class AbstractModel;
+class AbstractModelSelection;
+class QIODevice;
+
+// TODO: instead of doubling all data just read them from the job?
+class ModelStreamEncodeThread : public QThread
+{
+ Q_OBJECT
+ public:
+ ModelStreamEncodeThread( QObject *parent,
+ QIODevice *ioDevice,
+ AbstractModel *model, const
AbstractModelSelection *selection,
+ AbstractModelStreamEncoder *encoder );
+ virtual ~ModelStreamEncodeThread();
+
+ public: // QThread API
+ virtual void run();
+
+ public:
+ bool success() const;
+
+ Q_SIGNALS:
+ void modelExported( bool success );
+
+ protected:
+ QIODevice *mIODevice;
+ AbstractModel *mModel;
+ const AbstractModelSelection *mSelection;
+ AbstractModelStreamEncoder *mEncoder;
+
+ bool mSuccess;
+};
+
+inline ModelStreamEncodeThread::ModelStreamEncodeThread( QObject *parent,
+ QIODevice *ioDevice,
+ AbstractModel *model, const AbstractModelSelection *selection,
+ AbstractModelStreamEncoder *encoder )
+ : QThread( parent ),
+ mIODevice( ioDevice ), mModel( model ), mSelection( selection ), mEncoder(
encoder ),
+ mSuccess( false )
+{}
+
+inline bool ModelStreamEncodeThread::success() const { return mSuccess; }
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/kdeutils-4.0.85/okteta/program/oktetakakao/controllers/view/filter/filterview.cpp

new/kdeutils-4.0.98/okteta/program/oktetakakao/controllers/view/filter/filterview.cpp
---
old/kdeutils-4.0.85/okteta/program/oktetakakao/controllers/view/filter/filterview.cpp
2008-05-07 11:05:16.000000000 +0200
+++
new/kdeutils-4.0.98/okteta/program/oktetakakao/controllers/view/filter/filterview.cpp
2008-07-08 11:57:50.000000000 +0200
@@ -96,10 +96,14 @@
void FilterView::addParameterEdit( const QString &name, QWidget *parameterEdit
)
{
mOperationComboBox->addItem( name );
+ const int index =
mParameterSetEditStack->addWidget( parameterEdit );
+
+ // TODO: this is just a hack to have the first parameter edit widget wired
up
+ if( index == 0 )
+ onOperationChange( index );
}

-int FilterView::filterId() const { return mOperationComboBox->currentIndex(); }
void FilterView::getParameterSet( AbstractByteArrayFilterParameterSet
*parameterSet ) const
{
AbstractByteArrayFilterParameterSetEdit *parametersetEdit =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/kdeutils-4.0.85/okteta/program/oktetakakao/controllers/view/filter/filterview.h

new/kdeutils-4.0.98/okteta/program/oktetakakao/controllers/view/filter/filterview.h
---
old/kdeutils-4.0.85/okteta/program/oktetakakao/controllers/view/filter/filterview.h
2008-04-18 09:21:17.000000000 +0200
+++
new/kdeutils-4.0.98/okteta/program/oktetakakao/controllers/view/filter/filterview.h
2008-07-08 11:57:50.000000000 +0200
@@ -44,8 +44,7 @@
public: // set
void addParameterEdit( const QString &name, QWidget *parameterEdit );

- public: // get
- int filterId() const;
+ protected: // get
void getParameterSet( AbstractByteArrayFilterParameterSet *parameterSet )
const;

private Q_SLOTS:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/kdeutils-4.0.85/okteta/program/oktetakakao/controllers/view/replace/replacecontroller.cpp

new/kdeutils-4.0.98/okteta/program/oktetakakao/controllers/view/replace/replacecontroller.cpp
---
old/kdeutils-4.0.85/okteta/program/oktetakakao/controllers/view/replace/replacecontroller.cpp
2008-04-18 09:21:18.000000000 +0200
+++
new/kdeutils-4.0.98/okteta/program/oktetakakao/controllers/view/replace/replacecontroller.cpp
2008-07-08 11:57:50.000000000 +0200
@@ -1,7 +1,7 @@
/*
This file is part of the Okteta Kakao module, part of the KDE project.

- Copyright 2006-2007 Friedrich W. H. Kossebau <kossebau@xxxxxxx>
+ Copyright 2006-2008 Friedrich W. H. Kossebau <kossebau@xxxxxxx>

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -25,6 +25,8 @@
// controller
#include "kreplacedialog.h"
#include "kreplaceprompt.h"
+// search controller
+#include "../search/searchjob.h"
// lib
#include <kbytearraydocument.h>
// Okteta gui
@@ -41,88 +43,90 @@
#include <KActionCollection>
#include <KStandardAction>
#include <KMessageBox>
+// Qt
+#include <QtGui/QApplication>


// TODO: for docked widgets signal widgets if embedded or floating, if
horizontal/vertical
-ReplaceController::ReplaceController( KXmlGuiWindow *MW )
- : MainWindow( MW ), ViewWidget( 0 ), ByteArray( 0 ), ReplaceDialog( 0 ),
ReplacePrompt( 0 )
+ReplaceController::ReplaceController( KXmlGuiWindow *window )
+ : mWindow( window ), mByteArrayView( 0 ), mByteArrayModel( 0 ),
mReplaceDialog( 0 ), mReplacePrompt( 0 )
{
- KActionCollection* ActionCollection = MainWindow->actionCollection();
+ KActionCollection* ActionCollection = mWindow->actionCollection();

- ReplaceAction = KStandardAction::replace( this, SLOT(replace()),
ActionCollection );
+ mReplaceAction = KStandardAction::replace( this, SLOT(replace()),
ActionCollection );

setView( 0 );
}

void ReplaceController::setView( KAbstractView *view )
{
- if( ViewWidget ) ViewWidget->disconnect( this );
+ if( mByteArrayView ) mByteArrayView->disconnect( this );

- ViewWidget = view ? static_cast<KHEUI::KByteArrayView *>( view->widget() )
: 0;
+ mByteArrayView = view ? static_cast<KHEUI::KByteArrayView *>(
view->widget() ) : 0;
KByteArrayDocument *Document = view ? static_cast<KByteArrayDocument*>(
view->document() ) : 0;
- ByteArray = Document ? Document->content() : 0;
+ mByteArrayModel = Document ? Document->content() : 0;

- if( ByteArray )
+ if( mByteArrayModel )
{
}
- const bool HasView = ( ByteArray != 0 );
- ReplaceAction->setEnabled( HasView );
+ const bool hasView = ( mByteArrayModel != 0 );
+ mReplaceAction->setEnabled( hasView );
}


void ReplaceController::replace()
{
// ensure dialog
- if( !ReplaceDialog )
+ if( !mReplaceDialog )
{
- ReplaceDialog = new KReplaceDialog( MainWindow );
- connect( ReplaceDialog, SIGNAL(okClicked()), SLOT(onDialogOkClicked())
);
+ mReplaceDialog = new KReplaceDialog( mWindow );
+ connect( mReplaceDialog, SIGNAL(okClicked()),
SLOT(onDialogOkClicked()) );
}

- ReplaceDialog->setInSelection( ViewWidget->hasSelectedData() );
- ReplaceDialog->setCharCodec( ViewWidget->encodingName() );
+ mReplaceDialog->setInSelection( mByteArrayView->hasSelectedData() );
+ mReplaceDialog->setCharCodec( mByteArrayView->encodingName() );

- ReplaceDialog->show();
+ mReplaceDialog->show();
}

void ReplaceController::onDialogOkClicked()
{
- PreviousFound = false;
- NoOfReplacements = 0;
+ mPreviousFound = false;
+ mNoOfReplacements = 0;

- ReplaceDialog->hide();
+ mReplaceDialog->hide();

// prepare settings
- SearchData = ReplaceDialog->data();
- ReplaceData = ReplaceDialog->replaceData();
- IgnoreCase = ReplaceDialog->ignoreCase();
- Prompt = ReplaceDialog->prompt();
-
- if( ReplaceDialog->inSelection() )
- {
- Direction = FindForward;
- const KHE::KSection Selection = ViewWidget->selection();
- ReplaceFirstIndex = Selection.start();
- ReplaceLastIndex = Selection.end();
- CurrentIndex = Selection.start();
- DoWrap = true;
+ mSearchData = mReplaceDialog->data();
+ mReplaceData = mReplaceDialog->replaceData();
+ mIgnoreCase = mReplaceDialog->ignoreCase();
+ mDoPrompt = mReplaceDialog->prompt();
+
+ if( mReplaceDialog->inSelection() )
+ {
+ mDirection = FindForward;
+ const KHE::KSection selection = mByteArrayView->selection();
+ mReplaceFirstIndex = selection.start();
+ mReplaceLastIndex = selection.end();
+ mCurrentIndex = selection.start();
+ mDoWrap = true;
}
else
{
- Direction = ReplaceDialog->direction();
- const int CursorPosition = ViewWidget->cursorPosition();
- if( ReplaceDialog->fromCursor() && (CursorPosition!=0) )
+ mDirection = mReplaceDialog->direction();
+ const int cursorPosition = mByteArrayView->cursorPosition();
+ if( mReplaceDialog->fromCursor() && (cursorPosition!=0) )
{
- ReplaceFirstIndex = CursorPosition;
- ReplaceLastIndex = CursorPosition-1;
+ mReplaceFirstIndex = cursorPosition;
+ mReplaceLastIndex = cursorPosition-1;
}
else
{
- ReplaceFirstIndex = 0;
- ReplaceLastIndex = ByteArray->size()-1;
+ mReplaceFirstIndex = 0;
+ mReplaceLastIndex = mByteArrayModel->size()-1;
}
- CurrentIndex = (Direction==FindForward) ? ReplaceFirstIndex :
ReplaceLastIndex;
- DoWrap = (Direction==FindForward) ? (ReplaceLastIndex<CurrentIndex) :
(CurrentIndex<ReplaceFirstIndex);
+ mCurrentIndex = (mDirection==FindForward) ? mReplaceFirstIndex :
mReplaceLastIndex;
+ mDoWrap = (mDirection==FindForward) ?
(mReplaceLastIndex<mCurrentIndex) : (mCurrentIndex<mReplaceFirstIndex);
}

findNext();
@@ -130,29 +134,33 @@

void ReplaceController::findNext()
{
+ QApplication::setOverrideCursor( Qt::WaitCursor );
+
while( true )
{
// TODO: support ignorecase
- int Pos = ( Direction == FindForward ) ?
- ByteArray->indexOf( SearchData, CurrentIndex ) :
- ByteArray->lastIndexOf( SearchData,
CurrentIndex-SearchData.size()+1 );
- if( Pos != -1 )
+ SearchJob *searchJob = new SearchJob( mByteArrayModel, mSearchData,
mCurrentIndex, (mDirection==FindForward) );
+ const int pos = searchJob->exec();
+
+ if( pos != -1 )
{
- PreviousFound = true;
+ mPreviousFound = true;

- CurrentIndex = Pos;
- if( Prompt )
+ mCurrentIndex = pos;
+ if( mDoPrompt )
{
- ViewWidget->setSelection( Pos, Pos+SearchData.size()-1 );
- if( !ReplacePrompt )
+ QApplication::restoreOverrideCursor();
+
+ mByteArrayView->setSelection( pos, pos+mSearchData.size()-1 );
+ if( !mReplacePrompt )
{
- ReplacePrompt = new KReplacePrompt( MainWindow );
- connect( ReplacePrompt, SIGNAL(user1Clicked()),
SLOT(onPromptAllClicked()) );
- connect( ReplacePrompt, SIGNAL(user2Clicked()),
SLOT(onPromptSkipClicked()) );
- connect( ReplacePrompt, SIGNAL(user3Clicked()),
SLOT(onPromptReplaceClicked()) );
+ mReplacePrompt = new KReplacePrompt( mWindow );
+ connect( mReplacePrompt, SIGNAL(user1Clicked()),
SLOT(onPromptAllClicked()) );
+ connect( mReplacePrompt, SIGNAL(user2Clicked()),
SLOT(onPromptSkipClicked()) );
+ connect( mReplacePrompt, SIGNAL(user3Clicked()),
SLOT(onPromptReplaceClicked()) );
}
- if( ReplacePrompt->isHidden() )
- ReplacePrompt->show();
+ if( mReplacePrompt->isHidden() )
+ mReplacePrompt->show();
break;
}
else
@@ -162,35 +170,41 @@
}
}

- if( ReplacePrompt )
- ReplacePrompt->hide();
- ViewWidget->selectAll( false );
+ if( mReplacePrompt )
+ mReplacePrompt->hide();
+ mByteArrayView->selectAll( false );

- const QString ReplacementReport = (NoOfReplacements==0) ?
+ const QString replacementReport = (mNoOfReplacements==0) ?
i18nc( "@info", "No replacements done.") :
- i18ncp( "@info", "1 replacement done.", "%1 replacements done.",
NoOfReplacements );
+ i18ncp( "@info", "1 replacement done.", "%1 replacements done.",
mNoOfReplacements );
const QString messageBoxTitle = i18nc( "@title:window", "Replace" );
// reached end and
- if( DoWrap )
+ if( mDoWrap )
{
- const QString Question = ((Direction==FindForward) ?
+ QApplication::restoreOverrideCursor();
+
+ const QString Question = ((mDirection==FindForward) ?
i18nc( "@info", "<nl/>End of byte array reached.<nl/>Continue
from the beginning?" ) :
i18nc( "@info", "<nl/>Beginning of byte array
reached.<nl/>Continue from the end?" ));

- int Result = KMessageBox::questionYesNo( MainWindow,
ReplacementReport+Question, messageBoxTitle,
- KStandardGuiItem::cont(),
KStandardGuiItem::cancel() );
- if( Result == KMessageBox::No )
+ const int answer = KMessageBox::questionYesNo( mWindow,
replacementReport+Question, messageBoxTitle,
+
KStandardGuiItem::cont(), KStandardGuiItem::cancel() );
+ if( answer == KMessageBox::No )
break;
- CurrentIndex = (Direction==FindForward) ? 0 : ByteArray->size()-1;
- DoWrap = false;
- NoOfReplacements = 0;
+ mCurrentIndex = (mDirection==FindForward) ? 0 :
mByteArrayModel->size()-1;
+ mDoWrap = false;
+ mNoOfReplacements = 0;
+
+ QApplication::setOverrideCursor( Qt::WaitCursor );
}
else
{
- if( !PreviousFound )
- KMessageBox::sorry( MainWindow, i18nc("@info","Replace pattern
not found in byte array."), messageBoxTitle );
+ QApplication::restoreOverrideCursor();
+
+ if( !mPreviousFound )
+ KMessageBox::sorry( mWindow, i18nc("@info","Replace pattern
not found in byte array."), messageBoxTitle );
else
- KMessageBox::information( MainWindow, ReplacementReport,
messageBoxTitle );
+ KMessageBox::information( mWindow, replacementReport,
messageBoxTitle );
break;
}
}
@@ -198,23 +212,23 @@

void ReplaceController::replaceCurrent()
{
- ++NoOfReplacements;
- const int Inserted = ByteArray->replace( CurrentIndex, SearchData.size(),
- ReplaceData.constData(),
ReplaceData.size() );
- if( Direction == FindForward )
- CurrentIndex += Inserted;
+ ++mNoOfReplacements;
+ const int inserted = mByteArrayModel->replace( mCurrentIndex,
mSearchData.size(),
+ mReplaceData.constData(),
mReplaceData.size() );
+ if( mDirection == FindForward )
+ mCurrentIndex += inserted;
else
- --CurrentIndex;
+ --mCurrentIndex;
}

void ReplaceController::onPromptSkipClicked()
{
// skip current
{
- if( Direction == FindForward )
- CurrentIndex += ReplaceData.size();
+ if( mDirection == FindForward )
+ mCurrentIndex += mReplaceData.size();
else
- --CurrentIndex;
+ --mCurrentIndex;
}
findNext();
}
@@ -227,13 +241,11 @@

void ReplaceController::onPromptAllClicked()
{
- Prompt = false;
- ReplacePrompt->hide();
+ mDoPrompt = false;
+ mReplacePrompt->hide();

replaceCurrent();
findNext();
}

-ReplaceController::~ReplaceController()
-{
-}
+ReplaceController::~ReplaceController() {}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/kdeutils-4.0.85/okteta/program/oktetakakao/controllers/view/replace/replacecontroller.h

new/kdeutils-4.0.98/okteta/program/oktetakakao/controllers/view/replace/replacecontroller.h
---
old/kdeutils-4.0.85/okteta/program/oktetakakao/controllers/view/replace/replacecontroller.h
2008-04-18 09:21:18.000000000 +0200
+++
new/kdeutils-4.0.98/okteta/program/oktetakakao/controllers/view/replace/replacecontroller.h
2008-07-08 11:57:50.000000000 +0200
@@ -1,7 +1,7 @@
/*
This file is part of the Okteta Kakao module, part of the KDE project.

- Copyright 2006-2007 Friedrich W. H. Kossebau <kossebau@xxxxxxx>
+ Copyright 2006-2008 Friedrich W. H. Kossebau <kossebau@xxxxxxx>

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -46,11 +46,11 @@
Q_OBJECT

public:
- explicit ReplaceController( KXmlGuiWindow *MW );
+ explicit ReplaceController( KXmlGuiWindow *window );
virtual ~ReplaceController();

public: // KViewController API
- virtual void setView( KAbstractView *View );
+ virtual void setView( KAbstractView *view );

protected:
void findNext();
@@ -66,26 +66,26 @@
void onPromptReplaceClicked();

protected:
- KXmlGuiWindow *MainWindow;
- KHEUI::KByteArrayView *ViewWidget;
- KHECore::KAbstractByteArrayModel *ByteArray;
-
- KAction *ReplaceAction;
-
- QByteArray SearchData;
- QByteArray ReplaceData;
- bool PreviousFound:1;
- bool DoWrap:1;
- bool IgnoreCase:1;
- bool Prompt:1;
- KFindDirection Direction;
- int ReplaceFirstIndex;
- int ReplaceLastIndex;
- int CurrentIndex;
- int NoOfReplacements;
+ KXmlGuiWindow *mWindow;
+ KHEUI::KByteArrayView *mByteArrayView;
+ KHECore::KAbstractByteArrayModel *mByteArrayModel;
+
+ KAction *mReplaceAction;
+
+ QByteArray mSearchData;
+ QByteArray mReplaceData;
+ bool mPreviousFound:1;
+ bool mDoWrap:1;
+ bool mIgnoreCase:1;
+ bool mDoPrompt:1;
+ KFindDirection mDirection;
+ int mReplaceFirstIndex;
+ int mReplaceLastIndex;
+ int mCurrentIndex;
+ int mNoOfReplacements;

- KReplaceDialog *ReplaceDialog;
- KReplacePrompt *ReplacePrompt;
+ KReplaceDialog *mReplaceDialog;
+ KReplacePrompt *mReplacePrompt;
};

#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/kdeutils-4.0.85/okteta/program/oktetakakao/controllers/view/viewconfig/viewconfigcontroller.cpp

new/kdeutils-4.0.98/okteta/program/oktetakakao/controllers/view/viewconfig/viewconfigcontroller.cpp
---
old/kdeutils-4.0.85/okteta/program/oktetakakao/controllers/view/viewconfig/viewconfigcontroller.cpp
2008-04-18 09:21:18.000000000 +0200
+++
new/kdeutils-4.0.98/okteta/program/oktetakakao/controllers/view/viewconfig/viewconfigcontroller.cpp
2008-07-08 11:57:50.000000000 +0200
@@ -144,5 +144,5 @@

void ViewConfigController::toggleValueCharColumns( int VisibleColumns)
{
- ViewWidget->showBufferColumns( VisibleColumns+1 );
+ ViewWidget->setVisibleByteArrayColumns( VisibleColumns+1 );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/kdeutils-4.0.85/okteta/program/oktetakakao/io/bytearrayrawfilewritethread.cpp

new/kdeutils-4.0.98/okteta/program/oktetakakao/io/bytearrayrawfilewritethread.cpp
---
old/kdeutils-4.0.85/okteta/program/oktetakakao/io/bytearrayrawfilewritethread.cpp
2008-07-03 07:05:14.000000000 +0200
+++
new/kdeutils-4.0.98/okteta/program/oktetakakao/io/bytearrayrawfilewritethread.cpp
2008-07-08 11:57:50.000000000 +0200
@@ -41,25 +41,28 @@
KHECore::KPieceTableByteArrayModel *byteArray =
qobject_cast<KHECore::KPieceTableByteArrayModel*>( mDocument->content() );

QFile file( mFilePath );
- file.open( QIODevice::WriteOnly );
-
- QDataStream outStream( &file );
+ if( file.open(QIODevice::WriteOnly) )
+ {
+ QDataStream outStream( &file );

//TODO: this was
// outStream.writeRawData( byteArray->data(), byteArray->size() );
// make it quicker again by writing spans -> spaniterator

- for( int i = 0; i<byteArray->size(); ++i )
- {
- const char datum = byteArray->datum(i);
- outStream.writeRawData( &datum, 1 );
- }
+ for( int i = 0; i<byteArray->size(); ++i )
+ {
+ const char datum = byteArray->datum(i);
+ outStream.writeRawData( &datum, 1 );
+ }

- byteArray->setModified( false );
+ byteArray->setModified( false );

- //registerDiskModifyTime( file );TODO move into synchronizer
+ //registerDiskModifyTime( file );TODO move into synchronizer

- mSuccess = ( outStream.status() == QDataStream::Ok );
+ mSuccess = ( outStream.status() == QDataStream::Ok );
+ }
+ else
+ mSuccess = false;

emit documentWritten( mSuccess );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeutils-4.0.85/printer-applet/printer-applet.py
new/kdeutils-4.0.98/printer-applet/printer-applet.py
--- old/kdeutils-4.0.85/printer-applet/printer-applet.py 2008-06-03
11:34:14.000000000 +0200
+++ new/kdeutils-4.0.98/printer-applet/printer-applet.py 2008-07-08
11:57:51.000000000 +0200
@@ -160,7 +160,7 @@
}
try:
(title, text) = messages[self.get_reason ()]
- text = text.subs (self.get_printer ()).to_string ()
+ text = text.subs (self.get_printer ()).toString ()
except KeyError:
if self.get_level () == self.REPORT:
title = i18n("Printer report")
@@ -279,7 +279,7 @@
refreshAction.setIcon( KIcon("view-refresh") )
refreshAction.setText( i18n( "&Refresh" ) )
refreshAction.setShortcut(QKeySequence(Qt.Key_F5))
- self.connect(refreshAction, SIGNAL("triggered(bool)"),
self.hideMainWindow);
+ self.connect(refreshAction, SIGNAL("triggered(bool)"), self.refresh);

showCompletedJobsAction = KToggleAction("Show Completed Jobs",
self.mainWindow)
self.mainWindow.actionCollection().addAction("show_completed_jobs",
showCompletedJobsAction)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeutils-4.0.85/superkaramba/plasma/skapplet.cpp
new/kdeutils-4.0.98/superkaramba/plasma/skapplet.cpp
--- old/kdeutils-4.0.85/superkaramba/plasma/skapplet.cpp 2008-03-06
10:54:10.000000000 +0100
+++ new/kdeutils-4.0.98/superkaramba/plasma/skapplet.cpp 2008-07-08
11:57:51.000000000 +0200
@@ -267,7 +267,7 @@

QList<QMap<QString, QVariant> > result;

- foreach (QString theme, themes) {
+ foreach (const QString &theme, themes) {
ThemeFile themeFile(theme);

QMap<QString, QVariant> metadata;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeutils-4.0.85/superkaramba/plasma/skpackage.cpp
new/kdeutils-4.0.98/superkaramba/plasma/skpackage.cpp
--- old/kdeutils-4.0.85/superkaramba/plasma/skpackage.cpp 2008-05-21
10:32:41.000000000 +0200
+++ new/kdeutils-4.0.98/superkaramba/plasma/skpackage.cpp 2008-07-08
11:57:51.000000000 +0200
@@ -62,7 +62,7 @@
Plasma::PackageMetadata data;
data.setPluginName(name);
data.setImplementationApi("superkaramba");
- data.setType("SuperKaramba");
+ data.setCategory("SuperKaramba");
//data.setServiceType(const QString &);
data.setName(theme.name());
data.setDescription(i18n("SuperKaramba Theme"));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeutils-4.0.85/superkaramba/src/karambaapp.cpp
new/kdeutils-4.0.98/superkaramba/src/karambaapp.cpp
--- old/kdeutils-4.0.85/superkaramba/src/karambaapp.cpp 2008-01-29
10:15:16.000000000 +0100
+++ new/kdeutils-4.0.98/superkaramba/src/karambaapp.cpp 2008-07-08
11:57:51.000000000 +0200
@@ -71,7 +71,7 @@

void KarambaApplication::startThemes(const QList<KUrl> &lst)
{
- foreach(KUrl url, lst) {
+ foreach(const KUrl &url, lst) {
new Karamba(url);
}
}
@@ -110,14 +110,14 @@
if (isSessionRestored()) {
KSharedConfigPtr config = KGlobal::config();
KConfigGroup group(config, "Session");
- QList<QString> themePaths = group.readEntry("OpenThemes",
QList<QString>());
+ const QList<QString> themePaths = group.readEntry("OpenThemes",
QList<QString>());
/*
KConfig *config = sessionConfig();
KConfigGroup group(config, "Session");
QList<QString> themePaths = group.readEntry("OpenThemes",
QList<QString>());
*/

- foreach(QString path, themePaths) {
+ foreach(const QString &path, themePaths) {
lst.append(KUrl(path));
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeutils-4.0.85/superkaramba/src/karamba.cpp
new/kdeutils-4.0.98/superkaramba/src/karamba.cpp
--- old/kdeutils-4.0.85/superkaramba/src/karamba.cpp 2008-03-13
09:17:12.000000000 +0100
+++ new/kdeutils-4.0.98/superkaramba/src/karamba.cpp 2008-07-08
11:57:51.000000000 +0200
@@ -1331,8 +1331,8 @@
}

QString propertiesLine = lineParser.getString("PROPERTIES");
- QStringList properties = propertiesLine.split(",");
- foreach (QString property, properties) {
+ const QStringList properties = propertiesLine.split(",");
+ foreach (const QString &property, properties) {
QStringList options = property.split(":");
if (options.count() == 2) {
plasmasensor->setProperty(options[0].toLatin1(),
options[1]);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeutils-4.0.85/superkaramba/src/sensors/network.cpp
new/kdeutils-4.0.98/superkaramba/src/sensors/network.cpp
--- old/kdeutils-4.0.85/superkaramba/src/sensors/network.cpp 2008-01-05
00:53:34.000000000 +0100
+++ new/kdeutils-4.0.98/superkaramba/src/sensors/network.cpp 2008-07-08
11:57:51.000000000 +0200
@@ -172,9 +172,9 @@

void NetworkSensor::getIPAddress()
{
- QList<QNetworkInterface> interfaces = QNetworkInterface::allInterfaces();
+ const QList<QNetworkInterface> interfaces =
QNetworkInterface::allInterfaces();

- foreach (QNetworkInterface interface, interfaces) {
+ foreach (const QNetworkInterface &interface, interfaces) {
if (device == interface.name()) {
QList<QNetworkAddressEntry> entries = interface.addressEntries();
if (entries.count() > 0) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeutils-4.0.85/superkaramba/src/themefile.cpp
new/kdeutils-4.0.98/superkaramba/src/themefile.cpp
--- old/kdeutils-4.0.85/superkaramba/src/themefile.cpp 2008-05-21
10:32:41.000000000 +0200
+++ new/kdeutils-4.0.98/superkaramba/src/themefile.cpp 2008-07-08
11:57:51.000000000 +0200
@@ -326,8 +326,8 @@
d->script = d->name;

bool fileExtensionFound = false;
- QStringList availInterp = Kross::Manager::self().interpreters();
- foreach (QString interpreter, availInterp) {
+ const QStringList availInterp = Kross::Manager::self().interpreters();
+ foreach (const QString &interpreter, availInterp) {
QString fileExtension =
Kross::Manager::self().interpreterInfo(interpreter)->wildcard();
fileExtension.remove(0, 1);

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/kdeutils-4.0.85/sweeper/Mainpage.dox
new/kdeutils-4.0.98/sweeper/Mainpage.dox
--- old/kdeutils-4.0.85/sweeper/Mainpage.dox 1970-01-01 01:00:00.000000000
+0100
+++ new/kdeutils-4.0.98/sweeper/Mainpage.dox 2008-07-08 11:57:51.000000000
+0200
@@ -0,0 +1,7 @@
+/** @mainpage Sweeper
+
+The Sweeper application
+
+*/
+
+// DOXYGEN_SET_PROJECT_NAME = sweeper



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >