Merge (and solve conflicts with) latest master, including support for compiling w/ Qt4

Author: tibirna

CMakeLists.txt

@@ -19,9 +19,7 @@ set(CMAKE_AUTOMOC ON)
 
 # Select the Qt major version and its dependencies\
 set(QT_PACKAGE "Qt6" CACHE STRING "Major Qt version")
-#set_property(CACHE QT_PACKAGE PROPERTY STRINGS "Qt6" "Qt5" "Qt4")
-set_property(CACHE QT_PACKAGE PROPERTY STRINGS "Qt6" "Qt5")
-
+set_property(CACHE QT_PACKAGE PROPERTY STRINGS "Qt6" "Qt5" "Qt4")
 
 find_package(QT NAMES ${QT_PACKAGE} REQUIRED)
 set(QT Qt${QT_VERSION_MAJOR})

src/FileHistory.cc

@@ -17,6 +17,10 @@
 
 #include "git.h"
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+  #define HAVE_COLUMNTYPE
+#endif
+
 using namespace QGit;
 
 FileHistory::FileHistory(QObject* p, Git* g) : QAbstractItemModel(p), git(g) {
@@ -118,16 +122,32 @@ void FileHistory::clear(bool complete) {
   rowData.clear();
 
   if (testFlag(REL_DATE_F)) {
+#if QT_VERSION >= 0x06000
     secs = QDateTime::currentDateTime().toSecsSinceEpoch();
+#else
+    secs = QDateTime::currentDateTime().toTime_t();
+#endif
+#ifdef HAVE_COLUMNTYPE
     headerInfo[ColumnType::TIME_COL] = "Last Change";
+#else
+    headerInfo[5] = "Last Change";
+#endif
   } else {
     secs = 0;
+#ifdef HAVE_COLUMNTYPE
     headerInfo[ColumnType::TIME_COL] = "Author Date";
+#else
+    headerInfo[5] = "Author Date";
+#endif
   }
   rowCnt = revOrder.count();
   annIdValid = false;
   endResetModel();
+#ifdef HAVE_COLUMNTYPE
   emit headerDataChanged(Qt::Horizontal, 0, ColumnType::TIME_COL);
+#else
+  emit headerDataChanged(Qt::Horizontal, 0, 5);
+#endif
 }
 
 void FileHistory::on_newRevsAdded(const FileHistory* fh, const QVector<ShaString>& shaVec) {

src/common.cpp

@@ -265,5 +265,9 @@ RevFile& RevFile::operator<<(QDataStream& stream) {
 }
 
 QString qt4and5escaping(QString toescape) {
-    return toescape.toHtmlEscaped();
+#if QT_VERSION >= 0x050000
+	return toescape.toHtmlEscaped();
+#else
+	return Qt::escape(toescape);
+#endif
 }

src/common.h

@@ -223,7 +223,7 @@ namespace QGit {
 	enum FileDoubleClickAction {
 		VIEW_PATCH,
 		OPEN_IN_EDITOR,
-		OPEN_IN_DIFFER,
+		OPEN_IN_DIFFER
 	};
 
 	// settings booleans
@@ -246,7 +246,7 @@ namespace QGit {
 		USE_CMT_MSG_F   = 1 << 15,
 // 		OPEN_IN_EDITOR_F = 1 << 16,  //  not used anymore; subject to be replaced
 		ENABLE_DRAGNDROP_F = 1 << 17,
-		ENABLE_SHORTREF_F = 1 << 18,
+		ENABLE_SHORTREF_F = 1 << 18
 	};
 	const int FLAGS_DEF = USE_CMT_MSG_F | RANGE_SELECT_F | SMART_LBL_F | VERIFY_CMT_F | SIGN_PATCH_F | LOG_DIFF_TAB_F | MSG_ON_NEW_F | ENABLE_DRAGNDROP_F;
 

src/git.cpp

@@ -31,6 +31,12 @@
 
 #define GIT_LOG_FORMAT "%m%HX%PX%n%cn<%ce>%n%an<%ae>%n%at%n%s%n"
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
+    #define QT_ASPRINTF asprintf
+#else
+    #define QT_ASPRINTF sprintf
+#endif
+
 // Used on init() for reading parameters once;
 // It's OK to be unique among qgit windows.
 static bool startup = true;
@@ -1955,8 +1961,12 @@ Rev* Git::fakeRevData(SCRef sha, SCList parents, SCRef author, SCRef date, SCRef
         if (!patch.isEmpty())
                 data.append('\n' + patch);
 
+#if QT_VERSION >= 0x050000
         QTextCodec* tc = QTextCodec::codecForLocale();
         QByteArray* ba = new QByteArray(tc->fromUnicode(data));
+#else
+        QByteArray* ba = new QByteArray(data.toLatin1());
+#endif
         ba->append('\0');
 
         fh->rowData.append(ba);
@@ -2436,7 +2446,7 @@ void Git::on_loaded(FileHistory* fh, ulong byteSize, int loadTime,
                         ulong kb = byteSize / 1024;
                         double mbs = (double)byteSize / fh->loadTime / 1000;
                         QString tmp;
-                        tmp.asprintf("Loaded %lli revisions  (%li KB),   "
+                        tmp.QT_ASPRINTF("Loaded %lli revisions  (%li KB),   "
                                      "time elapsed: %i ms  (%.2f MB/s)",
                                      fh->revs.count(), kb, fh->loadTime, mbs);
 

src/listview.cpp

@@ -95,9 +95,15 @@ void ListView::setupGeometry() {
 
 	QHeaderView* hv = header();
 	hv->setStretchLastSection(true);
+#if QT_VERSION >= 0x050000
 	hv->setSectionResizeMode(LOG_COL, QHeaderView::Interactive);
 	hv->setSectionResizeMode(TIME_COL, QHeaderView::Interactive);
 	hv->setSectionResizeMode(ANN_ID_COL, QHeaderView::ResizeToContents);
+#else
+	hv->setResizeMode(LOG_COL, QHeaderView::Interactive);
+	hv->setResizeMode(TIME_COL, QHeaderView::Interactive);
+	hv->setResizeMode(ANN_ID_COL, QHeaderView::ResizeToContents);
+#endif
 	hv->resizeSection(GRAPH_COL, DEF_GRAPH_COL_WIDTH);
 	hv->resizeSection(LOG_COL, DEF_LOG_COL_WIDTH);
 	hv->resizeSection(HASH_COL, DEF_HASH_COL_WIDTH);
@@ -352,7 +358,11 @@ QPixmap ListView::pixmapFromSelection(const QStringList &revs, const QString &re
 		QStyleOptionViewItem o(opt);
 		QString dummy;
 		getTagMarkParams(dummy, o, refTypeFromName(ref), false);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
 		painter.fillRect(0, 0, fm.horizontalAdvance(ref)+2*spacing, height, o.palette.window());
+#else
+		painter.fillRect(0, 0, fm.width(ref)+2*spacing, height, o.palette.window());
+#endif
 		painter.drawText(spacing, fm.ascent()+1, ref);
 		row = 1;
 	}
@@ -432,13 +442,13 @@ struct ListView::DropInfo {
 		PATCHES  = 1 << 0,
 		REV_LIST = 1 << 1,
 		REV_RANGE = 1 << 2,
-		SAME_REPO     = 1 << 3,
+		SAME_REPO     = 1 << 3
 	};
 	enum Action {
 		PatchAction = Qt::CopyAction,
 		RebaseAction = Qt::MoveAction,
 		MoveRefAction = (Qt::LinkAction << 1) | Qt::MoveAction,
-		MergeAction = Qt::LinkAction,
+		MergeAction = Qt::LinkAction
 	};
 
 	QString sourceRepo;
@@ -1201,7 +1211,11 @@ QString ListView::refNameAt(const QPoint &pos)
  * Return the device pixel ratio
  */
 qreal ListViewDelegate::dpr(void) const {
-	return qApp->devicePixelRatio();
+#if QT_VERSION >= QT_VERSION_CHECK(5,6,0)
+    return qApp->devicePixelRatio();
+#else
+    return 1.0;
+#endif
 }
 
 void ListViewDelegate::addTextPixmap(QPixmap** pp, SCRef txt, const QStyleOptionViewItem& opt) const {
@@ -1221,7 +1235,9 @@ void ListViewDelegate::addTextPixmap(QPixmap** pp, SCRef txt, const QStyleOption
 			 static_cast<int>(text_height * dpr()));
 
 	QPixmap* newPm = new QPixmap(pixmapSize);
-	newPm->setDevicePixelRatio(dpr());
+#if QT_VERSION >= QT_VERSION_CHECK(5,6,0)
+    newPm->setDevicePixelRatio(dpr());
+#endif
 
 	QPainter p;
 	p.begin(newPm);

src/mainimpl.cpp

@@ -81,14 +81,25 @@ MainImpl::MainImpl(SCRef cd, QWidget* p) : QMainWindow(p) {
 	QSettings settings;
 	QString font(settings.value(STD_FNT_KEY).toString());
 	if (font.isEmpty()) {
+#if (QT_VERSION >= QT_VERSION_CHECK(5,2,0))
 		font = QFontDatabase::systemFont(QFontDatabase::GeneralFont).toString();
+#else
+		font = QApplication::font().toString();
+#endif
 	}
 	QGit::STD_FONT.fromString(font);
 
 	// set-up typewriter (fixed width) font
 	font = settings.value(TYPWRT_FNT_KEY).toString();
 	if (font.isEmpty()) { // choose a sensible default
+#if (QT_VERSION >= QT_VERSION_CHECK(5,2,0))
 		QFont fnt = QFontDatabase::systemFont(QFontDatabase::FixedFont);
+#else
+		QFont fnt = QApplication::font();
+		fnt.setStyleHint(QFont::TypeWriter, QFont::PreferDefault);
+		fnt.setFixedPitch(true);
+		fnt.setFamily(fnt.defaultFamily()); // the family corresponding
+#endif
 		font = fnt.toString();              // to current style hint
 	}
 	QGit::TYPE_WRITER_FONT.fromString(font);
@@ -99,10 +110,19 @@ MainImpl::MainImpl(SCRef cd, QWidget* p) : QMainWindow(p) {
 	tabWdg->addTab(rv->tabPage(), "&Rev list");
 
 	// hide close button for rev list tab
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+	// For Qt4: Use findChild to access QTabBar as tabBar() is protected
+	QTabBar* const tabBar = tabWdg->findChild<QTabBar*>();
+#else
+	// For Qt5+: Directly access tabBar()
 	QTabBar* const tabBar = tabWdg->tabBar();
+#endif
+
+if (tabBar) {
 	tabBar->setTabButton(0, QTabBar::RightSide, NULL);
 	tabBar->setTabButton(0, QTabBar::LeftSide, NULL);
-	connect(tabWdg, SIGNAL(tabCloseRequested(int)), SLOT(tabBar_tabCloseRequested(int)));
+}
+connect(tabWdg, SIGNAL(tabCloseRequested(int)), SLOT(tabBar_tabCloseRequested(int)));
 
 	// set-up file names loading progress bar
 	pbFileNamesLoading = new QProgressBar(statusBar());
@@ -710,7 +730,11 @@ bool MainImpl::eventFilter(QObject* obj, QEvent* ev) {
 		if (e->modifiers() == Qt::AltModifier) {
 
 			int idx = tabWdg->currentIndex();
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+			if (e->delta() < 0)
+#else
 			if (e->angleDelta().y() < 0)
+#endif
 				idx = (++idx == tabWdg->count() ? 0 : idx);
 			else
 				idx = (--idx < 0 ? tabWdg->count() - 1 : idx);
@@ -1141,7 +1165,11 @@ void MainImpl::shortCutActivated() {
 	QShortcut* se = dynamic_cast<QShortcut*>(sender());
 
 	if (se) {
+#if QT_VERSION >= 0x050000
 		const QKeySequence& key = se->key();
+#else
+		const int key = se->key();
+#endif
 
 		if (key == Qt::Key_I) {
 			rv->tab()->listViewLog->on_keyUp();
@@ -1322,7 +1350,11 @@ static void prepareRefSubmenu(QMenu* menu, const QStringList& refs, const QChar
 		QMenu* add_here = menu;
 		FOREACH_SL (pit, parts) {
 			if (pit == parts.end() - 1) break;
+	#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+			QMenu* found = add_here->findChild<QMenu*>(*pit);
+	#else
 			QMenu* found = add_here->findChild<QMenu*>(*pit, Qt::FindDirectChildrenOnly);
+	#endif
 			if(!found) {
 				found = add_here->addMenu(*pit);
 				found->setObjectName(*pit);

src/qgit.cpp

@@ -5,8 +5,16 @@
 	Copyright: See COPYING file that comes with this distribution
 
 */
-#include <QCommandLineParser>
+
 #include <QSettings>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+	#include <QCommandLineParser>
+#else
+	#include <QApplication>
+	#include <QCoreApplication>
+	#include <QStringList>
+	#include <iostream>
+#endif
 #include "config.h" // defines PACKAGE_VERSION
 #include "common.h"
 #include "mainimpl.h"
@@ -21,9 +29,13 @@ using namespace QGit;
 int main(int argc, char* argv[]) {
 
 	QApplication app(argc, argv);
+#if QT_VERSION_CHECK(5, 6, 0) <= QT_VERSION && QT_VERSION < QT_VERSION_CHECK(6,0,0)
+	app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
+#endif
 	QCoreApplication::setOrganizationName(ORG_KEY);
 	QCoreApplication::setApplicationName(APP_KEY);
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 	QCommandLineParser parser;
 	QCoreApplication::setApplicationVersion(PACKAGE_VERSION);
 	parser.addHelpOption();
@@ -47,6 +59,45 @@ int main(int argc, char* argv[]) {
 		QCoreApplication::setApplicationName("QGit");
 		parser.process(app.arguments());  // exits the process
 	}
+#else
+	QStringList arguments = QCoreApplication::arguments();
+	bool showHelp = false;
+	bool showVersion = false;
+	QStringList gitLogArgs;
+
+	for (int i = 1; i < arguments.size(); ++i) {
+		QString arg = arguments.at(i);
+		if (arg == "--help" || arg == "-h") {
+			showHelp = true;
+		} else if (arg == "--version" || arg == "-v") {
+			showVersion = true;
+		} else {
+			gitLogArgs.append(arg); // Collect positional arguments
+		}
+	}
+
+	if (showHelp) {
+		std::cout << "Usage: qgit [options] [git-log-args]\n"
+			<< "Options:\n"
+			<< "  --help, -h          Show this help message\n"
+			<< "  --version, -v       Show application version\n"
+			<< "\n"
+			<< "Arguments:\n"
+			<< "  git-log-args        Arguments forwarded to \"git log\"\n"
+			<< "                      See \"man git-log\" for details.\n";
+		return 0; // Exit after showing help
+	}
+
+	if (showVersion) {
+		std::cout << "QGit version: " << PACKAGE_VERSION << "\n";
+		return 0; // Exit after showing version
+	}
+
+	// Process git-log-args as needed
+	foreach (const QString& arg, gitLogArgs) {
+		std::cout << "Git log argument: " << arg.toStdString() << "\n";
+	}
+#endif
 
 	/* On Windows msysgit exec directory is set up
 	 * during installation so to always find git.exe

src/revsview.cpp

@@ -322,7 +322,7 @@ void RevsView::updateLineEditSHA(bool clear) {
 		l->setText(""); // clears history
 
 	else if (l->text() != st.sha()) {
-		auto hash = QGit::testFlag(QGit::ENABLE_SHORTREF_F)
+		QString hash = QGit::testFlag(QGit::ENABLE_SHORTREF_F)
 			? st.sha().left(git->shortHashLength())
 			: st.sha();
 

src/smartbrowse.cpp

@@ -224,7 +224,11 @@ bool SmartBrowse::eventFilter(QObject *obj, QEvent *event) {
 	if (sb && t == QEvent::Wheel && sb->orientation() == Qt::Vertical) {
 
 		QWheelEvent* we = static_cast<QWheelEvent*>(event);
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+		if (wheelRolled(we->delta(), visibilityFlags()))
+#else
 		if (wheelRolled(we->angleDelta().y(), visibilityFlags()))
+#endif
 			return true; // filter event out
 	}
 	return QObject::eventFilter(obj, event);