mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-05 13:19:32 -04:00
suspended unused code
This commit is contained in:
parent
9bc552aea4
commit
90d26e7323
2 changed files with 6 additions and 0 deletions
|
@ -18,6 +18,7 @@
|
||||||
* *
|
* *
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
|
|
||||||
|
#ifdef UNUSED_CODE
|
||||||
#include <gui/gxs/GxsIdDetails.h>
|
#include <gui/gxs/GxsIdDetails.h>
|
||||||
#include <util/PixmapMerging.h>
|
#include <util/PixmapMerging.h>
|
||||||
|
|
||||||
|
@ -39,3 +40,5 @@ QPixmap PixmapMerging::merge(const std::string & foregroundPixmapData, const std
|
||||||
|
|
||||||
return backgroundPixmap;
|
return backgroundPixmap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#ifndef PIXMAPMERGING_H
|
#ifndef PIXMAPMERGING_H
|
||||||
#define PIXMAPMERGING_H
|
#define PIXMAPMERGING_H
|
||||||
|
|
||||||
|
#ifdef UNUSED_CODE
|
||||||
#include <util/rsqtutildll.h>
|
#include <util/rsqtutildll.h>
|
||||||
|
|
||||||
#include <util/NonCopyable.h>
|
#include <util/NonCopyable.h>
|
||||||
|
@ -49,4 +50,6 @@ public:
|
||||||
RSQTUTIL_API static QPixmap merge(const std::string & foregroundPixmapData, const std::string & backgroundPixmapFilename);
|
RSQTUTIL_API static QPixmap merge(const std::string & foregroundPixmapData, const std::string & backgroundPixmapFilename);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#endif
|
||||||
#endif //PIXMAPMERGING_H
|
#endif //PIXMAPMERGING_H
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue