yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Port from KTemporaryFile to QTemporaryFile

Browse source 
REVIEW: 112742
This commit is contained in:
Anselmo L. S. Melo 2013-08-10 18:19:41 -03:00
parent a3e1635ba6
commit d258759ac9
6 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
effects/screenshot/screenshot.cpp
View file

@ -21,8 +21,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "screenshot.h" #include "screenshot.h"
#include <kwinglutils.h> #include <kwinglutils.h>
#include <kwinxrenderutils.h> #include <kwinxrenderutils.h>
#include <KDE/KTemporaryFile>
#include <QDebug> #include <QDebug>
#include <QtCore/QTemporaryFile>
#include <QtCore/QDir>
#include <QtDBus/QDBusConnection> #include <QtDBus/QDBusConnection>
#include <QVarLengthArray> #include <QVarLengthArray>
#include <QtGui/QPainter> #include <QtGui/QPainter>
@ -304,8 +305,7 @@ QString ScreenShotEffect::blitScreenshot(const QRect &geometry)
#endif #endif
} }
KTemporaryFile temp; QTemporaryFile temp(QDir::tempPath() + QDir::separator() + QLatin1String("kwin_screenshot_XXXXXX.png"));
temp.setSuffix(QStringLiteral(".png"));
temp.setAutoRemove(false); temp.setAutoRemove(false);
if (!temp.open()) { if (!temp.open()) {
return QString(); return QString();

4
egl_wayland_backend.cpp
View file

@ -26,9 +26,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <kwinglplatform.h> #include <kwinglplatform.h>
// KDE // KDE
#include <KDE/KDebug> #include <KDE/KDebug>
#include <KDE/KTemporaryFile>
// Qt // Qt
#include <QSocketNotifier> #include <QSocketNotifier>
#include <QTemporaryFile>
// xcb // xcb
#include <xcb/xtest.h> #include <xcb/xtest.h>
// Wayland // Wayland
@ -398,7 +398,7 @@ ShmPool::ShmPool(wl_shm *shm)
, m_pool(NULL) , m_pool(NULL)
, m_poolData(NULL) , m_poolData(NULL)
, m_size(1024 * 1024) // TODO: useful size? , m_size(1024 * 1024) // TODO: useful size?
, m_tmpFile(new KTemporaryFile()) , m_tmpFile(new QTemporaryFile())
, m_valid(createPool()) , m_valid(createPool())
, m_offset(0) , m_offset(0)
{ {

4
egl_wayland_backend.h
View file

@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// xcb // xcb
#include <xcb/shm.h> #include <xcb/shm.h>
class KTemporaryFile; class QTemporaryFile;
struct wl_buffer; struct wl_buffer;
struct wl_shm; struct wl_shm;
@ -89,7 +89,7 @@ private:
wl_shm_pool *m_pool; wl_shm_pool *m_pool;
void *m_poolData; void *m_poolData;
size_t m_size; size_t m_size;
QScopedPointer<KTemporaryFile> m_tmpFile; QScopedPointer<QTemporaryFile> m_tmpFile;
bool m_valid; bool m_valid;
int m_offset; int m_offset;
}; };

1
kcmkwin/kwincompositing/main.cpp
View file

@ -45,6 +45,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QPaintEngine> #include <QPaintEngine>
#include <QTimer> #include <QTimer>
#include <QLabel> #include <QLabel>
#include <QTemporaryFile>
#include <KPluginFactory> #include <KPluginFactory>
#include <KPluginLoader> #include <KPluginLoader>
#include <KIcon> #include <KIcon>

4
kcmkwin/kwincompositing/main.h
View file

@ -24,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <kcmodule.h> #include <kcmodule.h>
#include <ksharedconfig.h> #include <ksharedconfig.h>
#include <ktemporaryfile.h>
#include "kwin_interface.h" #include "kwin_interface.h"
@ -34,6 +33,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
class KPluginSelector; class KPluginSelector;
class KActionCollection; class KActionCollection;
class QLabel; class QLabel;
class QTemporaryFile;
namespace KWin namespace KWin
{ {
@ -95,7 +95,7 @@ private:
Ui::KWinCompositingConfig ui; Ui::KWinCompositingConfig ui;
QMap<QString, QString> mPreviousConfig; QMap<QString, QString> mPreviousConfig;
KTemporaryFile mTmpConfigFile; QTemporaryFile mTmpConfigFile;
KSharedConfigPtr mTmpConfig; KSharedConfigPtr mTmpConfig;
bool m_showConfirmDialog; bool m_showConfirmDialog;
KActionCollection* m_actionCollection; KActionCollection* m_actionCollection;

4
rules.cpp
View file

@ -24,7 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <kconfig.h> #include <kconfig.h>
#include <KDE/KXMessages> #include <KDE/KXMessages>
#include <QRegExp> #include <QRegExp>
#include <ktemporaryfile.h> #include <QTemporaryFile>
#include <QFile> #include <QFile>
#include <ktoolinvocation.h> #include <ktoolinvocation.h>
#include <QDebug> #include <QDebug>
@ -86,7 +86,7 @@ Rules::Rules()
Rules::Rules(const QString& str, bool temporary) Rules::Rules(const QString& str, bool temporary)
: temporary_state(temporary ? 2 : 0) : temporary_state(temporary ? 2 : 0)
{ {
KTemporaryFile file; QTemporaryFile file;
if (file.open()) { if (file.open()) {
QByteArray s = str.toUtf8(); QByteArray s = str.toUtf8();
file.write(s.data(), s.length()); file.write(s.data(), s.length());