diff -r c9d1dad83ad0 -r 4b7306f52bb5 src/dialogs.h --- a/src/dialogs.h Mon Jun 02 14:34:23 2014 +0300 +++ b/src/dialogs.h Tue Jun 03 20:28:10 2014 +0300 @@ -46,7 +46,7 @@ explicit OverlayDialog (QWidget* parent = null, Qt::WindowFlags f = 0); virtual ~OverlayDialog(); - String fpath() const; + QString fpath() const; int ofsx() const; int ofsy() const; double lwidth() const; @@ -72,8 +72,8 @@ public: explicit LDrawPathDialog (const bool validDefault, QWidget* parent = null, Qt::WindowFlags f = 0); virtual ~LDrawPathDialog(); - String filename() const; - void setPath (String path); + QString filename() const; + void setPath (QString path); private: Q_DISABLE_COPY (LDrawPathDialog) @@ -115,9 +115,9 @@ Q_OBJECT public: - explicit ExtProgPathPrompt (String progName, QWidget* parent = 0, Qt::WindowFlags f = 0); + explicit ExtProgPathPrompt (QString progName, QWidget* parent = 0, Qt::WindowFlags f = 0); virtual ~ExtProgPathPrompt(); - String getPath() const; + QString getPath() const; public slots: void findPath(); @@ -138,4 +138,4 @@ void slot_mail(); }; -void bombBox (const String& message); +void bombBox (const QString& message);