diff options
| author |  Fabio Bas | 2009-02-16 11:09:32 +0000 |
|---|---|---|
| committer | Fabio Bas | 2009-02-16 11:09:32 +0000 |
| commit | b42ee6ed99c1ef7c8c1abb5af2f93160675ab492 (patch) | |
| tree | 3d33636b5ee3233072973cdbdac119e913921468 | |
| parent | updated german translations (diff) | |
| download | KVIrc-b42ee6ed99c1ef7c8c1abb5af2f93160675ab492.tar.gz KVIrc-b42ee6ed99c1ef7c8c1abb5af2f93160675ab492.tar.bz2 KVIrc-b42ee6ed99c1ef7c8c1abb5af2f93160675ab492.zip | |
fix for #367
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3075 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | src/kvirc/kernel/kvi_theme.cpp | 14 | ||||
| -rw-r--r-- | src/kvirc/ui/kvi_window.cpp | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/kvirc/kernel/kvi_theme.cpp b/src/kvirc/kernel/kvi_theme.cpp index b38aa5948..88d6e15d6 100644 --- a/src/kvirc/kernel/kvi_theme.cpp +++ b/src/kvirc/kernel/kvi_theme.cpp @@ -121,7 +121,7 @@ bool KviThemeInfo::loadFromDirectory(const QString &szThemeDirectory,bool bIgnor QString szD = szThemeDirectory; szD.append(KVI_PATH_SEPARATOR_CHAR); szD.append(KVI_THEMEINFO_FILE_NAME); - + if(!load(szD)) return false; // loading failed for some reason @@ -245,7 +245,7 @@ namespace KviTheme return false; } - QPixmap out; + QImage out; QString szScreenshotFileName = options.absoluteDirectory(); if(szScreenshotFileName.isEmpty()) @@ -263,9 +263,9 @@ namespace KviTheme } if(pix.width() > 600 || pix.height() > 450) - out.fromImage(pix.scaled(640,450,QIMAGE_SCALE_MIN,Qt::SmoothTransformation)); + out = pix.scaled(640,450,QIMAGE_SCALE_MIN,Qt::SmoothTransformation); else - out.fromImage(pix); + out = pix; szScreenshotFileName = options.absoluteDirectory(); KviQString::ensureLastCharIs(szScreenshotFileName,KVI_PATH_SEPARATOR_CHAR); @@ -277,9 +277,9 @@ namespace KviTheme } if(pix.width() > 300 || pix.height() > 225) - out.fromImage(pix.scaled(300,225,QIMAGE_SCALE_MIN,Qt::SmoothTransformation)); + out = pix.scaled(300,225,QIMAGE_SCALE_MIN,Qt::SmoothTransformation); else - out.fromImage(pix); + out = pix; szScreenshotFileName = options.absoluteDirectory(); KviQString::ensureLastCharIs(szScreenshotFileName,KVI_PATH_SEPARATOR_CHAR); @@ -289,7 +289,7 @@ namespace KviTheme options.setLastError(__tr2qs("Failed to save the screenshot image")); return false; } - + return true; } }; diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp index ce42723f6..aa5ac28b0 100644 --- a/src/kvirc/ui/kvi_window.cpp +++ b/src/kvirc/ui/kvi_window.cpp @@ -79,7 +79,7 @@ #endif #ifdef COMPILE_KDE_SUPPORT - #include <kwindowsystem.h> + #include <KWindowSystem> #endif #if defined(COMPILE_ON_WINDOWS) |