[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdegraphics/kuickshow/src
From:       Helge Deller <deller () kde ! org>
Date:       2003-11-02 20:28:39
[Download RAW message or body]

CVS commit by deller: 

deprecated -= 3
warnings -= 3


  M +4 -5      imagewindow.cpp   1.56
  M +3 -3      kuick.h   1.3
  M +4 -4      kuickshow.cpp   1.79
  M +2 -2      printing.cpp   1.17


--- kdegraphics/kuickshow/src/imagewindow.cpp  #1.55:1.56
@@ -740,5 +740,5 @@ void ImageWindow::dropEvent( QDropEvent 
         QString tmpFile;
         const KURL &url = list.first();
-        if (KIO::NetAccess::download( url, tmpFile ) )
+        if (KIO::NetAccess::download( url, tmpFile, this ) )
         {
             loadImage( tmpFile );
@@ -826,9 +826,8 @@ void ImageWindow::saveImage()
     KFileDialog dlg( m_saveDirectory, tmp.fileFilter, this, "filedialog", true
 #if KDE_VERSION >= 310
-                     ,keepSize );
-
-#else
-                    );
+                     ,keepSize
 #endif
+                   );
+
     QString selection = m_saveDirectory.isEmpty() ?
                             m_kuim->filename() :

--- kdegraphics/kuickshow/src/kuick.h  #1.2:1.3
@@ -35,7 +35,7 @@ public:
     static QSize frameSize( WId win = 0L ) {
         if ( win ) {
-            KWin::Info info = KWin::info( win );
-            int wborder = info.frameGeometry.width() - info.geometry.width();
-            int hborder = info.frameGeometry.height() - info.geometry.height();
+            KWin::WindowInfo info = KWin::windowInfo(win, NET::WMKDEFrameStrut, NET::WM2TransientFor);
+            int wborder = info.frameGeometry().width() - info.geometry().width();
+            int hborder = info.frameGeometry().height() - info.geometry().height();
         
             if ( wborder || hborder ) { // we get a 0,0 border when not shown

--- kdegraphics/kuickshow/src/kuickshow.cpp  #1.78:1.79
@@ -146,5 +146,5 @@ KuickShow::KuickShow( const char *name )
 #if KDE_VERSION >= 310
             if ( name == "application/octet-stream" ) // unknown -> stat()
-                name = KIO::NetAccess::mimetype( url );
+                name = KIO::NetAccess::mimetype( url, this );
 #endif
 
@@ -467,6 +467,6 @@ void KuickShow::slotSelected( const KFil
 
 // downloads item if necessary
-void KuickShow::showFileItem( ImageWindow */*view*/,
-                              const KFileItem */*item*/ )
+void KuickShow::showFileItem( ImageWindow * /*view*/,
+                              const KFileItem * /*item*/ )
 {
 
@@ -1142,5 +1142,5 @@ void KuickShow::toggleBrowser()
         show();
         raise();
-        KWin::setActiveWindow( winId() ); // ### this should not be necessary
+        KWin::activateWindow( winId() ); // ### this should not be necessary
 //         setFocus();
     }

--- kdegraphics/kuickshow/src/printing.cpp  #1.16:1.17
@@ -316,10 +316,10 @@ int KuickPrintDialogPage::scaleHeight() 
 void KuickPrintDialogPage::setScaleWidth( int pixels )
 {
-    m_width->setValue( pixelsToUnit( pixels ) );
+    m_width->setValue( (int) pixelsToUnit( pixels ) );
 }
 
 void KuickPrintDialogPage::setScaleHeight( int pixels )
 {
-    m_width->setValue( pixelsToUnit( pixels ) );
+    m_width->setValue( (int) pixelsToUnit( pixels ) );
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]