Explorar el Código

Use setWindowIcon instead of deprecated setIcon.
Call KWin::setIcons only on X11.


git-svn-id: file:///var/svn/tigccpp/trunk@1042 9552661e-59e3-4036-b4f2-dbe53926924f

kevinkofler hace 17 años
padre
commit
cd93effdda
Se han modificado 2 ficheros con 16 adiciones y 4 borrados
  1. 8 2
      ktigcc/mainform.cpp
  2. 8 2
      ktigcc/srcfilewin.cpp

+ 8 - 2
ktigcc/mainform.cpp

@@ -994,8 +994,14 @@ void setTabWidth(KTextEditor::View *view, unsigned tabWidth)
 
 void MainForm::init()
 {
-  setIcon(QPixmap(":/images/icon.png"));
-  KWin::setIcons(winId(),*(icon()),QPixmap(":/images/ktigcc.png"));
+  QPixmap smallIcon(":/images/ktigcc.png");
+  QPixmap largeIcon(":/images/icon.png");
+  QIcon windowIcon(smallIcon);
+  windowIcon.addPixmap(largeIcon);
+  setWindowIcon(windowIcon);
+#ifdef Q_WS_X11
+  KWin::setIcons(winId(),largeIcon,smallIcon);
+#endif
   ticables_library_init();
   tifiles_library_init();
   ticalcs_library_init();

+ 8 - 2
ktigcc/srcfilewin.cpp

@@ -158,8 +158,14 @@ class KReplaceWithSelectionS : public KReplace {
 
 void SourceFileWindow::initBase()
 {
-  setIcon(QPixmap(":/images/icon.png"));
-  KWin::setIcons(winId(),*(icon()),QPixmap(":/images/ktigcc.png"));
+  QPixmap smallIcon(":/images/ktigcc.png");
+  QPixmap largeIcon(":/images/icon.png");
+  QIcon windowIcon(smallIcon);
+  windowIcon.addPixmap(largeIcon);
+  setWindowIcon(windowIcon);
+#ifdef Q_WS_X11
+  KWin::setIcons(winId(),largeIcon,smallIcon);
+#endif
   sourceFiles.append(THIS);
   THIS->dirWatch=new KDirWatch(this);
   setCaption(caption()+" - "+THIS->fileName);