comparison kdiff3/src-QT4/fileaccess.h @ 80:fcd146072e0c

0.9.93

 #ifndef FILEACCESS_H
 #define FILEACCESS_H
 
 #include <QDialog>
 #include <QDateTime>
-
-#include <kprogress.h>
+#include <QEventLoop>
+#include <QLabel>
+#include <QProgressBar>
+
+#include <kprogressdialog.h>
 #include <kio/job.h>
 #include <kio/jobclasses.h>
-#include <kurldrag.h>
 
 #include <list>
 
 bool wildcardMultiMatch( const QString& wildcard, const QString& testString, bool bCaseSensitive );
 

    QDateTime   lastRead()      const;
 
    QString fileName() const; // Just the name-part of the path, without parent directories
    QString filePath() const; // The path-string that was used during construction
    QString prettyAbsPath() const;
-   KURL url() const;
-   QString absFilePath() const;
+   KUrl url() const;
+   QString absoluteFilePath() const;
 
    bool isLocal() const;
 
    bool readFile(void* pDestBuffer, unsigned long maxLength );
    bool writeFile(const void* pSrcBuffer, unsigned long length );

    bool removeFile();
    static bool removeFile( const QString& );
    static bool makeDir( const QString& );
    static bool removeDir( const QString& );
    static bool exists( const QString& );
-   static QString cleanDirPath( const QString& );
+   static QString cleanPath( const QString& );
 
    //bool chmod( const QString& );
    bool rename( const QString& );
    static bool symLink( const QString& linkTarget, const QString& linkLocation );
 
    void addPath( const QString& txt );
    QString getStatusText();
 private:
    void setUdsEntry( const KIO::UDSEntry& e );
-   KURL m_url;
+   KUrl m_url;
    bool m_bLocal;
    bool m_bValidData;
 
    unsigned long m_size;
    QDateTime m_modificationTime;

    QString m_linkTarget;
    QString m_user;
    QString m_group;
    QString m_name;
    QString m_path;
-   QString m_absFilePath;
+   QString m_absoluteFilePath;
    QString m_localCopy;
    QString m_statusText;  // Might contain an error string, when the last operation didn't succeed.
 
    friend class FileAccessJobHandler;
 };

    bool m_bFollowDirLinks;
 
    bool scanLocalDirectory( const QString& dirName, t_DirectoryList* dirList );
 
 private slots:
-   void slotStatResult( KIO::Job* );
-   void slotSimpleJobResult( KIO::Job* pJob );
-   void slotPutJobResult( KIO::Job* pJob );
-
-   void slotGetData(KIO::Job*,const QByteArray&);
-   void slotPutData(KIO::Job*, QByteArray&);
-
-   void slotListDirInfoMessage( KIO::Job*, const QString& msg );
+   void slotStatResult( KJob* );
+   void slotSimpleJobResult( KJob* pJob );
+   void slotPutJobResult( KJob* pJob );
+
+   void slotGetData(KJob*,const QByteArray&);
+   void slotPutData(KJob*, QByteArray&);
+
+   void slotListDirInfoMessage( KJob*, const QString& msg );
    void slotListDirProcessNewEntries( KIO::Job *, const KIO::UDSEntryList& l );
 
-   void slotPercent( KIO::Job* pJob, unsigned long percent );
+   void slotPercent( KJob* pJob, unsigned long percent );
 };
 
 class ProgressDialog : public QDialog
 {
    Q_OBJECT

    // Requirement: 0 < dMin < dMax < 1
    void setRangeTransformation( double dMin, double dMax );
    void setSubRangeTransformation( double dMin, double dMax );
 
    void exitEventLoop();
-   void enterEventLoop( KIO::Job* pJob, const QString& jobInfo );
+   void enterEventLoop( KJob* pJob, const QString& jobInfo );
 
    bool wasCancelled();
    void show();
    void hide();
    

    std::list<ProgressLevelData> m_progressStack;
    
    int m_progressDelayTimer;
    std::list<QEventLoop*> m_eventLoopStack;
 
-   KProgress* m_pProgressBar;
-   KProgress* m_pSubProgressBar;
+   QProgressBar* m_pProgressBar;
+   QProgressBar* m_pSubProgressBar;
    QLabel* m_pInformation;
    QLabel* m_pSubInformation;
    QLabel* m_pSlowJobInfo;
    QPushButton* m_pAbortButton;
    void recalc(bool bRedrawUpdate);
    QTime m_t1;
    QTime m_t2;
    bool m_bWasCancelled;
-   KIO::Job* m_pJob;
+   KJob* m_pJob;
    QString m_currentJobInfo;  // Needed if the job doesn't stop after a reasonable time.
    bool m_bStayHidden;
 protected:
    virtual void reject();
 private slots: