diff options
| author | gregory guy <gregory-tde@laposte.net> | 2020-07-16 14:07:49 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2020-07-26 11:33:19 +0200 |
| commit | cd1471858e29d0d23355a93178e063fd0550d31c (patch) | |
| tree | 6a4d62d831ce3a5a9b7cabac8cf578f622fd5b43 /starter/starter.cpp | |
| parent | 443bb972fa23026cdd48cfd5976b210c5dd470eb (diff) | |
| download | tde-style-baghira-cd1471858e29d0d23355a93178e063fd0550d31c.tar.gz tde-style-baghira-cd1471858e29d0d23355a93178e063fd0550d31c.zip | |
Conversion to the cmake building system.
Added a man page taken from the Debian packaging system.
Signed-off-by: gregory guy <gregory-tde@laposte.net>
Resolve issues that occurred during CMake conversion.
Concatenate the commands for generating pixmaps.h with CMake
so that there is no need to use the GNU specific sed option -i.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Signed-off-by: gregory guy <gregory-tde@laposte.net>
(cherry picked from commit d0c03cc9a910ea44cea57b1af43bbd90eb86d4bc)
Diffstat (limited to 'starter/starter.cpp')
| -rw-r--r-- | starter/starter.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/starter/starter.cpp b/starter/starter.cpp index e411b77..df333e2 100644 --- a/starter/starter.cpp +++ b/starter/starter.cpp @@ -7,7 +7,7 @@ #include <tdeconfig.h> #include <tdemessagebox.h> #include <tdeapplication.h> -# include <tdepopupmenu.h> +#include <tdepopupmenu.h> #include <tqimage.h> #include <tqfile.h> #include <tqlabel.h> @@ -228,9 +228,9 @@ void starter::reloadImages() pth = configDialog->BaseURL->url(); else pth = iLoader->iconPath("bStarter", TDEIcon::Small, true); - if (pth) + if (!pth.isEmpty()) pixmap = TQImage(pth); - if (!pth || pixmap.isNull()) + if (pth.isEmpty() || pixmap.isNull()) { pixmap = TQPixmap(22,22); pixmap.fill(TQt::black); @@ -240,9 +240,9 @@ void starter::reloadImages() pth = configDialog->HoverURL->url(); else pth = iLoader->iconPath("bStarter_hover", TDEIcon::Small, true); - if (pth) + if (!pth.isEmpty()) hoverPixmap = TQImage(pth); - if (!pth || hoverPixmap.isNull()) + if (pth.isEmpty() || hoverPixmap.isNull()) { hoverPixmap = TQPixmap(22,22); hoverPixmap.fill(TQt::black); @@ -252,9 +252,9 @@ void starter::reloadImages() pth = configDialog->DownURL->url(); else pth = iLoader->iconPath("bStarter_down", TDEIcon::Small, true); - if (pth) + if (!pth.isEmpty()) downPixmap = TQImage(pth); - if (!pth || downPixmap.isNull()) + if (pth.isEmpty() || downPixmap.isNull()) { downPixmap = TQPixmap(22,22); downPixmap.fill(TQt::white); @@ -481,3 +481,5 @@ extern "C" parent, "baghirastarter"); } } + +#include "starter.moc" |