Merge pull request #2878 from NickCao/main

fakevim: fix build with qt 6.6.0
pbek · Oct 12, 2023 · 369b888 · 369b888
2 parents d199468 + 3116af3
commit 369b888
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/libraries/fakevim/fakevim/fakevimhandler.cpp b/src/libraries/fakevim/fakevim/fakevimhandler.cpp
@@ -1177,14 +1177,6 @@ inline QString msgMarkNotSet(const QString &text)
     return Tr::tr("Mark \"%1\" not set.").arg(text);
 }
 
-static void initSingleShotTimer(QTimer *timer, int interval, FakeVimHandler::Private *receiver,
-                                void (FakeVimHandler::Private::*slot)())
-{
-    timer->setSingleShot(true);
-    timer->setInterval(interval);
-    QObject::connect(timer, &QTimer::timeout, receiver, slot);
-}
-
 class Input
 {
 public:
@@ -2538,6 +2530,16 @@ class FakeVimHandler::Private : public QObject
     FakeVimSettings &s = *fakeVimSettings();
 };
 
+static void initSingleShotTimer(QTimer *timer,
+                                int interval,
+                                FakeVimHandler::Private *receiver,
+                                void (FakeVimHandler::Private::*slot)())
+{
+    timer->setSingleShot(true);
+    timer->setInterval(interval);
+    QObject::connect(timer, &QTimer::timeout, receiver, slot);
+}
+
 FakeVimHandler::Private::GlobalData FakeVimHandler::Private::g;
 
 FakeVimHandler::Private::Private(FakeVimHandler *parent, QWidget *widget)