From: perihelion <per...@fr...> - 2008-06-05 22:01:07
|
kapp->aboutData()->programName() to KGlobal::mainComponent().aboutData()->programName() KGlobal::config() to KGlobal::config().data() tar.isOpened() to tar.isOpen() --- src/backup.cpp | 14 +++++++------- src/kgpgme.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/backup.cpp b/src/backup.cpp index a1b8f48..916952d 100644 --- a/src/backup.cpp +++ b/src/backup.cpp @@ -89,9 +89,9 @@ BackupDialog::BackupDialog(QWidget *parent, const char *name) "In this case, mount the shared-folder to the local file system and ask %2 to use that mount point.<br>" "Warning: you should not run %3 at the same time on both computers, or you risk to loss data while the two applications are desynced.</li>" "</ul><p>Please remember that you should not change the content of that folder manually (eg. adding a file in a basket folder will not add that file to the basket).</p>") - .arg(kapp->aboutData()->programName()) - .arg(kapp->aboutData()->programName()) - .arg(kapp->aboutData()->programName()), + .arg(KGlobal::mainComponent().aboutData()->programName()) + .arg(KGlobal::mainComponent().aboutData()->programName()) + .arg(KGlobal::mainComponent().aboutData()->programName()), folderWidget); folderLayout->addWidget(moveFolder); folderLayout->addWidget(useFolder); @@ -178,7 +178,7 @@ void BackupDialog::backup() QDir dir; // Compute a default file name & path (eg. "Baskets_2007-01-31.tar.gz"): - KConfig *config = KGlobal::config(); + KConfig *config = KGlobal::config().data(); config->setGroup("Backups"); QString folder = config->readEntry("lastFolder", QDir::homePath()) + "/"; QString fileName = i18np("Backup filename (without extension), %1 is the date", "Baskets_%1") @@ -346,12 +346,12 @@ void Backup::setFolderAndRestart(const QString &folder, const QString &message) 0, "<qt>" + message.arg( (folder.endsWith("/") ? folder.left(folder.length() - 1) : folder), - kapp->aboutData()->programName()), + KGlobal::mainComponent().aboutData()->programName()), i18n("Restart") ); // Restart the application: - KRun::runCommand(binaryPath, kapp->aboutData()->programName(), kapp->iconName()); + KRun::runCommand(binaryPath, KGlobal::mainComponent().aboutData()->programName(), kapp->iconName()); exit(0); } @@ -410,7 +410,7 @@ void RestoreThread::run() m_success = false; KTar tar(m_tarFile, "application/x-gzip"); tar.open(QIODevice::ReadOnly); - if (tar.isOpened()) { + if (tar.isOpen()) { const KArchiveDirectory *directory = tar.directory(); if (directory->entries().contains(backupMagicFolder)) { const KArchiveEntry *entry = directory->entry(backupMagicFolder); diff --git a/src/kgpgme.h b/src/kgpgme.h index 4585998..6dcbab5 100644 --- a/src/kgpgme.h +++ b/src/kgpgme.h @@ -27,7 +27,7 @@ #ifdef HAVE_LIBGPGME -#include <gpgme/gpgme.h> +#include <gpgme.h> #include <qstringlist.h> /** -- 1.5.2.4 |
From: perihelion <per...@fr...> - 2008-06-05 22:01:01
|
modified: src/focusedwidgets.h modified: src/note.h --- src/focusedwidgets.h | 6 +++--- src/note.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/focusedwidgets.h b/src/focusedwidgets.h index 657d1d4..40ba9a8 100644 --- a/src/focusedwidgets.h +++ b/src/focusedwidgets.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003 by Sébastien Laoût * + * Copyright (C) 2003 by S�bastien Lao�t * * sl...@li... * * * * This program is free software; you can redistribute it and/or modify * @@ -23,7 +23,7 @@ #include <ktextedit.h> #include <kcolorcombo.h> -#include <kfontcombo.h> +#include <QFontComboBox> #include <kcombobox.h> #include <klineedit.h> #include <kapplication.h> @@ -70,7 +70,7 @@ class FocusedColorCombo : public KColorCombo }; // TODO: Rename to EscapableKFontCombo -class FocusedFontCombo : public KFontCombo +class FocusedFontCombo : public QFontComboBox { Q_OBJECT public: diff --git a/src/note.h b/src/note.h index 25aad3c..fef5abb 100644 --- a/src/note.h +++ b/src/note.h @@ -25,7 +25,7 @@ #include <qpixmap.h> //Added by qt3to4: #include <Q3ValueList> -#include <kpixmap.h> +#include <QPixmap> #include <qdatetime.h> #include "notecontent.h" @@ -163,7 +163,7 @@ class Note /// DRAWING: private: QPixmap m_bufferedPixmap; - KPixmap m_bufferedSelectionPixmap; + QPixmap m_bufferedSelectionPixmap; public: void draw(QPainter *painter, const QRect &clipRect); void drawBufferOnScreen(QPainter *painter, const QPixmap &contentPixmap); -- 1.5.2.4 |
From: Kelvie W. <ke...@ie...> - 2008-06-07 21:10:40
|
On Thursday, June 05, 2008 15:00:12 perihelion wrote: > kapp->aboutData()->programName() to KGlobal::mainComponent().aboutData()->programName() > KGlobal::config() to KGlobal::config().data() > tar.isOpened() to tar.isOpen() > --- > src/backup.cpp | 14 +++++++------- > src/kgpgme.h | 2 +- > 2 files changed, 8 insertions(+), 8 deletions(-) <snip> Could you re-send this patch with this part removed? I think we'll need some CMake magic to find gpgme.h. > diff --git a/src/kgpgme.h b/src/kgpgme.h > index 4585998..6dcbab5 100644 > --- a/src/kgpgme.h > +++ b/src/kgpgme.h > @@ -27,7 +27,7 @@ > > #ifdef HAVE_LIBGPGME > > -#include <gpgme/gpgme.h> > +#include <gpgme.h> > #include <qstringlist.h> > > /** -- Kelvie Wong |