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

List:       kde-commits
Subject:    kdelibs/kio
From:       Jaroslaw Staniek <js () iidea ! pl>
Date:       2004-09-13 11:48:28
Message-ID: 20040913114828.DDFB4233A () office ! kde ! org
[Download RAW message or body]

CVS commit by staniek: 

compile fixes
(reviewed by dfaure)


  M +3 -3      kfile/kfiledialog.cpp   1.379
  M +3 -1      kfile/kpropertiesdialog.cpp   1.317
  M +6 -2      kio/tcpslavebase.cpp   1.135


--- kdelibs/kio/kfile/kfiledialog.cpp  #1.378:1.379
@@ -474,6 +474,6 @@ void KFileDialog::slotOk()
                 else { // d->url is not a directory,
                     // maybe we are in File(s) | Directory mode
-                    if ( mode() & KFile::File == KFile::File ||
-                        mode() & KFile::Files == KFile::Files )
+                    if ( (mode() & KFile::File) == KFile::File ||
+                        (mode() & KFile::Files) == KFile::Files )
                         done = false;
                 }
@@ -1753,5 +1753,5 @@ void KFileDialog::setOperationMode( Oper
        d->okButton->setGuiItem( KStdGuiItem::save() );
     else
-       d->okButton->setGuiItem( KStdGuiItem::KStdGuiItem::ok() );
+       d->okButton->setGuiItem( KStdGuiItem::ok() );
     updateLocationWhatsThis ();
     updateAutoSelectExtension ();

--- kdelibs/kio/kfile/kpropertiesdialog.cpp  #1.316:1.317
@@ -1028,5 +1028,5 @@ void KFilePropsPlugin::slotEditFileType(
   QString keditfiletype = QString::fromLatin1("keditfiletype");
   KRun::runCommand( keditfiletype
-                    + " --parent " + QString::number( properties->topLevelWidget()->winId())
+                    + " --parent " + QString::number( (ulong)properties->topLevelWidget()->winId())
                     + " " + KProcess::quote(d->mimeType),
                     keditfiletype, keditfiletype /*unused*/);
@@ -1633,4 +1633,5 @@ KFilePermissionsPropsPlugin::KFilePermis
     strUser = user->pw_name;
 
+#ifdef Q_OS_UNIX
   setgrent();
   for (i=0; ((ge = getgrent()) != 0L) && (i < maxEntries); i++)
@@ -1653,4 +1654,5 @@ KFilePermissionsPropsPlugin::KFilePermis
   }
   endgrent();
+#endif //Q_OS_UNIX
 
   /* add the effective Group to the list .. */

--- kdelibs/kio/kio/tcpslavebase.cpp  #1.134:1.135
@@ -191,5 +191,5 @@ ssize_t TCPSlaveBase::readLine(char *dat
   char tmpbuf[1024];   // 1kb temporary buffer for peeking
   *data = 0;
-  int clen = 0;
+  ssize_t clen = 0;
   char *buf = data;
   int rc = 0;
@@ -288,4 +288,5 @@ bool TCPSlaveBase::connectToHost( const 
                                   bool sendError )
 {
+#ifdef Q_OS_UNIX
     unsigned short int p;
     KExtendedSocket ks;
@@ -382,4 +383,7 @@ bool TCPSlaveBase::connectToHost( const 
 
     return true;
+#else //!Q_OS_UNIX
+    return false;
+#endif Q_OS_UNIX
 }
 


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