12 files changed, 10 insertions, 42 deletions
diff --git a/examples/messagingaccounts/main_messagingaccounts.cpp b/examples/messagingaccounts/main_messagingaccounts.cpp
index b97547d2..ba6959de 100644
--- a/examples/messagingaccounts/main_messagingaccounts.cpp
+++ b/examples/messagingaccounts/main_messagingaccounts.cpp
@@ -38,13 +38,9 @@
 
 int main(int argc, char** argv)
 {
-    if (QMail::fileLock("messagingsettings-instance.lock") == -1)
-        qFatal("MessagingSettings already running!\n");
-
     QApplication app(argc, argv);
     app.setWindowIcon(QIcon(":icon/messagingaccounts"));
     AccountSettings settings;
     settings.show();
     return app.exec();
 }
-
diff --git a/examples/qtmail/CMakeLists.txt b/examples/qtmail/CMakeLists.txt
index a97c4130..6f0c8017 100644
--- a/examples/qtmail/CMakeLists.txt
+++ b/examples/qtmail/CMakeLists.txt
@@ -51,7 +51,7 @@ target_include_directories(QtMail
   ../../src/libraries/qmfmessageserver
   ../../src/libraries/qmfwidgets)
 target_link_libraries(QtMail
-  PUBLIC Qt6::Core Qt6::Core5Compat Qt6::Widgets QmfClient QmfMessageServer QmfWidgets)
+  PUBLIC Qt6::Core Qt6::Widgets QmfClient QmfMessageServer QmfWidgets)
 
 add_executable(qtmail5 main.cpp)
 target_link_libraries(qtmail5
diff --git a/examples/qtmail/accountsettings.cpp b/examples/qtmail/accountsettings.cpp
index 7294a781..e99b50dd 100644
--- a/examples/qtmail/accountsettings.cpp
+++ b/examples/qtmail/accountsettings.cpp
@@ -41,7 +41,6 @@
 #include <QListView>
 #include <QTimer>
 #include <QMessageBox>
-#include <QRegExp>
 #include <QToolBar>
 #include <qtmailnamespace.h>
 
diff --git a/examples/qtmail/attachmentlistwidget.cpp b/examples/qtmail/attachmentlistwidget.cpp
index b2702391..f7a6ac79 100644
--- a/examples/qtmail/attachmentlistwidget.cpp
+++ b/examples/qtmail/attachmentlistwidget.cpp
@@ -45,6 +45,7 @@
 #include <QPointer>
 #include <QMouseEvent>
 #include <QHeaderView>
+#include <QMimeDatabase>
 #include <qmailnamespace.h>
 
 class AttachmentListWidget;
@@ -344,7 +345,7 @@ QVariant AttachmentListModel::data( const QModelIndex & index, int role) const
                 return sizeString(fi.size());
                 break;
             case 2:
-                QString mimeType = QMail::mimeTypeFromFileName(path);
+                QString mimeType = QMimeDatabase().mimeTypeForFile(path).name();
                 if (mimeType.isEmpty()) mimeType = "Unknown";
                 return mimeType;
                 break;
diff --git a/examples/qtmail/emailclient.cpp b/examples/qtmail/emailclient.cpp
index 74f85a2c..f817957e 100644
--- a/examples/qtmail/emailclient.cpp
+++ b/examples/qtmail/emailclient.cpp
@@ -474,7 +474,7 @@ EmailClient::EmailClient(QWidget *parent, Qt::WindowFlags f)
     setObjectName( "EmailClient" );
 
     //start messageserver if it's not running
-    if (!isMessageServerRunning() && !startMessageServer())
+    if (!QMail::isMessageServerRunning && !startMessageServer())
         qFatal("Unable to start messageserver!");
 
     //run account setup if we don't have any defined yet
@@ -596,17 +596,6 @@ void EmailClient::connectServiceAction(QMailServiceAction* action)
     connect(action, SIGNAL(progressChanged(uint, uint)), this, SLOT(progressChanged(uint, uint)));
 }
 
-bool EmailClient::isMessageServerRunning() const
-{
-    QString lockfile = "messageserver-instance.lock";
-    int lockid = QMail::fileLock(lockfile);
-    if (lockid == -1)
-        return true;
-
-    QMail::fileUnlock(lockid);
-    return false;
-}
-
 bool EmailClient::cleanExit(bool force)
 {
     bool result = true;
diff --git a/examples/qtmail/emailclient.h b/examples/qtmail/emailclient.h
index 701464b2..12107351 100644
--- a/examples/qtmail/emailclient.h
+++ b/examples/qtmail/emailclient.h
@@ -289,7 +289,6 @@ private slots:
 private:
     void connectServiceAction(QMailServiceAction* action);
 
-    bool isMessageServerRunning() const;
     virtual EmailFolderView* createFolderView();
     virtual MessageListView* createMessageListView();
 
diff --git a/examples/qtmail/emailcomposer.cpp b/examples/qtmail/emailcomposer.cpp
index d26778eb..a8dc1a66 100644
--- a/examples/qtmail/emailcomposer.cpp
+++ b/examples/qtmail/emailcomposer.cpp
@@ -64,6 +64,7 @@
 #include <QSyntaxHighlighter>
 #include <QCompleter>
 #include <QRegularExpression>
+#include <QMimeDatabase>
 
 static int minimumLeftWidth = 65;
 static const QString placeholder("(no subject)");
@@ -805,7 +806,7 @@ QMailMessage EmailComposerInterface::message() const
                 QString partName(fi.fileName());
                 QString filePath(fi.absoluteFilePath());
 
-                QString mimeType(QMail::mimeTypeFromFileName(attachment));
+                QString mimeType(QMimeDatabase().mimeTypeForFile(attachment).name());
                 QMailMessageContentType type(mimeType.toLatin1());
                 type.setName(partName.toLatin1());
 
diff --git a/examples/qtmail/main.cpp b/examples/qtmail/main.cpp
index 64344be8..da649949 100644
--- a/examples/qtmail/main.cpp
+++ b/examples/qtmail/main.cpp
@@ -41,12 +41,6 @@ int main(int argc, char** argv)
 {
     QApplication app(argc,argv);
 
-    // This is ~/.config/QtProject/Qtmail.conf
-    qMailLoggersRecreate("QtProject", "Qtmail", "Qtmail");
-
-    if (QMail::fileLock("qtmail-instance.lock") == -1)
-        qFatal("Qtmail already running!\n");
-
     app.setWindowIcon(QIcon(":icon/qtmail"));
 
     EmailClient appWindow;
diff --git a/examples/qtmail/messagelistview.cpp b/examples/qtmail/messagelistview.cpp
index 5852844d..2f1f1fed 100644
--- a/examples/qtmail/messagelistview.cpp
+++ b/examples/qtmail/messagelistview.cpp
@@ -264,7 +264,8 @@ QVariant MessageListModel<BaseModel>::data(const QModelIndex & index, int role)
             if (state == Qt::Unchecked)
                 return QVariant();
         } else if (role == Qt::DecorationRole) {
-            return QIcon(SuperType::data(index, QMailMessageModelBase::MessageStatusIconRole).toString());
+            //return QIcon(SuperType::data(index, QMailMessageModelBase::MessageStatusIconRole).toString());
+            return QIcon(); // FIXME
         } else if (role == Qt::ForegroundRole) {
             QMailMessageMetaData message(SuperType::idFromIndex(index));
             if (message.id().isValid()) {
diff --git a/examples/qtmail/readmail.cpp b/examples/qtmail/readmail.cpp
index 112c2095..cd025042 100644
--- a/examples/qtmail/readmail.cpp
+++ b/examples/qtmail/readmail.cpp
@@ -43,7 +43,6 @@
 #include <qcursor.h>
 #include <qtooltip.h>
 #include <qwhatsthis.h>
-#include <qregexp.h>
 #include <qstackedwidget.h>
 #include <qmessagebox.h>
 #include <qboxlayout.h>
diff --git a/examples/serverobserver/CMakeLists.txt b/examples/serverobserver/CMakeLists.txt
index e8b54e1a..9e4909ea 100644
--- a/examples/serverobserver/CMakeLists.txt
+++ b/examples/serverobserver/CMakeLists.txt
@@ -7,4 +7,4 @@ add_executable(serverobserver5 ${SRC})
 target_include_directories(serverobserver5
   PRIVATE ../../src/libraries/qmfclient ../../src/libraries/qmfclient/support)
 target_link_libraries(serverobserver5
-  PRIVATE Qt6::Core Qt6::Core5Compat Qt6::Test QmfClient QmfMessageServer)
+  PRIVATE Qt6::Core Qt6::Test QmfClient QmfMessageServer)
diff --git a/examples/serverobserver/main.cpp b/examples/serverobserver/main.cpp
index 4eca3d39..7cb82a11 100644
--- a/examples/serverobserver/main.cpp
+++ b/examples/serverobserver/main.cpp
@@ -45,22 +45,11 @@ static void fakeSleep(int time)
     cond.wait(&m, time);
 }
 
-static bool messageServerRunning()
-{
-    QString lockfile = "messageserver-instance.lock";
-    int lockid = QMail::fileLock(lockfile);
-        if (lockid == -1)
-                return true;
-
-    QMail::fileUnlock(lockid);
-    return false;
-}
-
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    while (!messageServerRunning()) {
+    while (!QMail::isMessageServerRunning()) {
         qWarning() << "Message server is not running. Waiting.";
         fakeSleep(5000);
     }