diff options
Diffstat (limited to 'kipi-plugins/slideshow/slideshowloader.cpp')
-rw-r--r-- | kipi-plugins/slideshow/slideshowloader.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/kipi-plugins/slideshow/slideshowloader.cpp b/kipi-plugins/slideshow/slideshowloader.cpp index b208783..4b27b36 100644 --- a/kipi-plugins/slideshow/slideshowloader.cpp +++ b/kipi-plugins/slideshow/slideshowloader.cpp @@ -22,10 +22,10 @@ // QT includes -#include <qimage.h> -#include <qwmatrix.h> -#include <qpainter.h> -#include <qvaluelist.h> +#include <tqimage.h> +#include <tqwmatrix.h> +#include <tqpainter.h> +#include <tqvaluelist.h> // KDE includes @@ -38,7 +38,7 @@ namespace KIPISlideShowPlugin { - LoadThread::LoadThread(LoadedImages* loadedImages, QMutex* imageLock, const KURL path, + LoadThread::LoadThread(LoadedImages* loadedImages, TQMutex* imageLock, const KURL path, const int angle, int width, int height) { m_path = path; @@ -54,17 +54,17 @@ namespace KIPISlideShowPlugin void LoadThread::run() { - QImage newImage(m_path.path()); + TQImage newImage(m_path.path()); // Rotate according to angle if ( m_angle != 0 ) { - QWMatrix matrix; + TQWMatrix matrix; matrix.rotate((double)m_angle); newImage.xForm( matrix ); } - newImage = QImage(newImage.smoothScale(m_swidth, m_sheight, QImage::ScaleMin)); + newImage = TQImage(newImage.smoothScale(m_swidth, m_sheight, TQ_ScaleMin)); m_imageLock->lock(); m_loadedImages->insert(m_path, newImage); @@ -82,8 +82,8 @@ namespace KIPISlideShowPlugin m_sheight = height; m_loadingThreads = new LoadingThreads(); m_loadedImages = new LoadedImages(); - m_imageLock = new QMutex(); - m_threadLock = new QMutex(); + m_imageLock = new TQMutex(); + m_threadLock = new TQMutex(); for ( uint i = 0; i < uint(m_cacheSize/2) && i < uint(m_pathList.count()); i++ ) { LoadThread* newThread = new LoadThread(m_loadedImages, m_imageLock, KURL(m_pathList[i].first), @@ -174,18 +174,18 @@ namespace KIPISlideShowPlugin } - QImage SlideShowLoader::getCurrent() { + TQImage SlideShowLoader::getCurrent() { checkIsIn(m_currIndex); m_imageLock->lock(); - QImage returned = (*m_loadedImages)[m_pathList[m_currIndex].first]; + TQImage returned = (*m_loadedImages)[m_pathList[m_currIndex].first]; m_imageLock->unlock(); return returned; } - QString SlideShowLoader::currFileName() + TQString SlideShowLoader::currFileName() { return KURL(m_pathList[m_currIndex].first).fileName(); } @@ -198,7 +198,7 @@ namespace KIPISlideShowPlugin void SlideShowLoader::checkIsIn(int index) { m_threadLock->lock(); - if (m_loadingThreads->contains(m_pathList[index].first)) + if (m_loadingThreads->tqcontains(m_pathList[index].first)) { if ( (*m_loadingThreads)[m_pathList[index].first]->running() ) (*m_loadingThreads)[m_pathList[index].first]->wait(); |