diff options
| author |  Fabio Bas | 2008-10-04 14:20:03 +0000 |
|---|---|---|
| committer | Fabio Bas | 2008-10-04 14:20:03 +0000 |
| commit | 82ca022576927930fc879085b4244b9b686f0ee7 (patch) | |
| tree | 0f1176cc8436ab224f1b725eeed9151aab0c6710 /src/modules/http | |
| parent | fixed rules for compatibility; replaced deprecated function (diff) | |
| download | KVIrc-82ca022576927930fc879085b4244b9b686f0ee7.tar.gz KVIrc-82ca022576927930fc879085b4244b9b686f0ee7.tar.bz2 KVIrc-82ca022576927930fc879085b4244b9b686f0ee7.zip | |
many fixed to filetrasferwindows / transfer modules
fixed a signal in kvitexticonwin
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2645 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/http')
| -rw-r--r-- | src/modules/http/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | src/modules/http/httpfiletransfer.cpp | 7 | ||||
| -rw-r--r-- | src/modules/http/httpfiletransfer.h | 1 |
3 files changed, 16 insertions, 7 deletions
diff --git a/src/modules/http/CMakeLists.txt b/src/modules/http/CMakeLists.txt index 54b05d810..b3a48e052 100644 --- a/src/modules/http/CMakeLists.txt +++ b/src/modules/http/CMakeLists.txt @@ -9,8 +9,23 @@ SET(kvihttp_SRCS httpfiletransfer.cpp ) +SET(files + kvi_httpicons.png +) + # After this call, files will be moc'ed to moc_kvi_*.cpp QT4_WRAP_CPP(kvihttp_MOC_SRCS ${kvihttp_MOC_HDRS}) SET(kvi_module_name kvihttp) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) + +IF(UNIX) + IF(APPLE) + INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/pics/) + ELSE() + # Assume linux + INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/pics/) + ENDIF() +ELSEIF(WIN32) + INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/pics/) +ENDIF()
\ No newline at end of file diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp index 4e2cd62a7..98986b260 100644 --- a/src/modules/http/httpfiletransfer.cpp +++ b/src/modules/http/httpfiletransfer.cpp @@ -88,11 +88,6 @@ void KviHttpFileTransfer::autoClean() die(); } -void KviHttpFileTransfer::die() -{ - delete this; -} - QString KviHttpFileTransfer::localFileName() { return m_pHttpRequest->fileName(); @@ -342,7 +337,7 @@ void KviHttpFileTransfer::init() QPixmap * pix = g_pIconManager->getImage("kvi_httpicons.png", false); if(pix)g_pHttpIcon = new QPixmap(*pix); - else g_pHttpIcon = new QPixmap(192,48); + else g_pHttpIcon = 0; } void KviHttpFileTransfer::done() diff --git a/src/modules/http/httpfiletransfer.h b/src/modules/http/httpfiletransfer.h index 2983ef43e..471236ab4 100644 --- a/src/modules/http/httpfiletransfer.h +++ b/src/modules/http/httpfiletransfer.h @@ -80,7 +80,6 @@ public: virtual int displayHeight(int iLineSpacing); virtual void fillContextPopup(KviTalPopupMenu * m); virtual bool active(); - virtual void die(); virtual QString tipText(); virtual QString localFileName(); protected slots: |