fix for Qt 6.8

soramimi · Mar 30, 2024 · c1a617f · c1a617f
1 parent 0696b6f
commit c1a617f
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 12 deletions.
diff --git a/src/BasicRepositoryDialog.cpp b/src/BasicRepositoryDialog.cpp
@@ -6,7 +6,7 @@
 struct BasicRepositoryDialog::Private {
 	MainWindow *mainwindow = nullptr;
 	GitPtr git;
-	QList<Git::Remote> remotes;
+	std::vector<Git::Remote> remotes;
 };
 
 BasicRepositoryDialog::BasicRepositoryDialog(MainWindow *mainwindow, GitPtr g)
@@ -36,7 +36,7 @@ GitPtr BasicRepositoryDialog::git()
 	return m->git;
 }
 
-QList<Git::Remote> const *BasicRepositoryDialog::remotes() const
+std::vector<Git::Remote> const *BasicRepositoryDialog::remotes() const
 {
 	return &m->remotes;
 }

diff --git a/src/BasicRepositoryDialog.h b/src/BasicRepositoryDialog.h
@@ -20,7 +20,7 @@ class BasicRepositoryDialog : public QDialog {
 	GitPtr git();
 	QString updateRemotesTable(QTableWidget *tablewidget);
 
-	const QList<Git::Remote> *remotes() const;
+	const std::vector<Git::Remote> *remotes() const;
 	void getRemotes_();
 	void setSshKey_(const QString &sshkey);
 };

diff --git a/src/CloneDialog.cpp b/src/CloneDialog.cpp
@@ -130,7 +130,7 @@ void CloneDialog::on_pushButton_open_existing_clicked()
 	if (QFileInfo(dir).isDir()) {
 		QString url;
 		GitPtr g = mainwindow()->git(dir, {}, {});
-		QList<Git::Remote> vec;
+		std::vector<Git::Remote> vec;
 		if (g->isValidWorkingCopy()) {
 			g->getRemoteURLs(&vec);
 		}

diff --git a/src/Git.cpp b/src/Git.cpp
@@ -1460,7 +1460,7 @@ bool Git::rm_cached(QString const &file)
 	return git(cmd.arg(file));
 }
 
-void Git::getRemoteURLs(QList<Remote> *out)
+void Git::getRemoteURLs(std::vector<Remote> *out)
 {
 	out->clear();
 	git("remote -v");

diff --git a/src/Git.h b/src/Git.h
@@ -535,7 +535,7 @@ class Git : QObject {
 	bool commit_amend_m(QString const &text, bool sign, AbstractPtyProcess *pty);
 	bool revert(const CommitID &id);
 	bool push_tags(AbstractPtyProcess *pty = nullptr);
-	void getRemoteURLs(QList<Remote> *out);
+	void getRemoteURLs(std::vector<Remote> *out);
 	void createBranch(QString const &name);
 	void checkoutBranch(QString const &name);
 	void mergeBranch(QString const &name, MergeFastForward ff, bool squash);

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -3957,7 +3957,7 @@ void MainWindow::detectGitServerType(GitPtr g)
 	*ptrGitHub() = GitHubRepositoryInfo();
 
 	QString push_url;
-	QList<Git::Remote> remotes;
+	std::vector<Git::Remote> remotes;
 	g->getRemoteURLs(&remotes);
 	for (Git::Remote const &r : remotes) {
 		if (r.purpose == "push") {
@@ -4588,7 +4588,7 @@ void MainWindow::on_treeWidget_repos_customContextMenuRequested(const QPoint &po
 		strings.push_back(repo->name);
 		strings.push_back(repo->local_dir);
 		{
-			QList<Git::Remote> remotes;
+			std::vector<Git::Remote> remotes;
 			git(repo->local_dir, {}, {})->getRemoteURLs(&remotes);
 			std::sort(remotes.begin(), remotes.end());
 			auto it = std::unique(remotes.begin(), remotes.end());

diff --git a/src/RepositoryPropertyDialog.cpp b/src/RepositoryPropertyDialog.cpp
@@ -65,7 +65,7 @@ bool RepositoryPropertyDialog::execEditRemoteDialog(Git::Remote *remote, EditRem
 		*remote = Git::Remote();
 	}
 
-	if (remote->name.isEmpty() && list->isEmpty()) {
+	if (remote->name.isEmpty() && list->empty()) {
 		op = EditRemoteDialog::RemoteAdd;
 		remote->name = "origin";
 	}

diff --git a/src/SubmoduleAddDialog.cpp b/src/SubmoduleAddDialog.cpp
@@ -113,7 +113,7 @@ void SubmoduleAddDialog::on_pushButton_open_existing_clicked()
 	if (QFileInfo(dir).isDir()) {
 		QString url;
 		GitPtr g = mainwindow()->git(dir, {}, {});
-		QList<Git::Remote> vec;
+		std::vector<Git::Remote> vec;
 		if (g->isValidWorkingCopy()) {
 			g->getRemoteURLs(&vec);
 		}

diff --git a/src/main.cpp b/src/main.cpp
@@ -93,10 +93,14 @@ int main(int argc, char *argv[])
 		QDir().mkpath(global->app_config_dir);
 	}
 
-//	qputenv("QT_SCALE_FACTOR", "1.5");
+#ifdef Q_OS_WIN
+	putenv("QT_ENABLE_HIGHDPI_SCALING=1");
+	// QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+#endif
+	// qputenv("QT_SCALE_FACTOR", "1.5");
+
 
 	QApplication a(argc, argv);
-//	a.setAttribute(Qt::AA_UseHighDpiPixmaps);
 
 	global->init(&a);