TabId define removed, uint64_t -> qulonglong (should fix Linux build)

Author: VioletGiraffe

file-commander-core/src/ccontroller.cpp

@@ -128,11 +128,11 @@ void CController::attachListenersToTab(Panel p, CPanel& tab)
 		tab.addCurrentItemChangeListener(listener);
 }
 
-TabId CController::addTab(Panel p, const QString& path, bool activate)
+qulonglong CController::addTab(Panel p, const QString& path, bool activate)
 {
 	CPanel& tab = createTab(p);
 	tab.setPath(path, refreshCauseOther); // Fires onCurrentPathChanged -> logs the new tab's path to the visited-locations list
-	const TabId newId = tab.id();
+	const qulonglong newId = tab.id();
 
 	if (activate)
 		switchActiveTab(p, newId);
@@ -143,7 +143,7 @@ TabId CController::addTab(Panel p, const QString& path, bool activate)
 	return newId;
 }
 
-void CController::closeTab(Panel p, TabId tabId)
+void CController::closeTab(Panel p, qulonglong tabId)
 {
 	auto& tabList = _panels[(size_t)p];
 	if (tabList.tabs.size() == 1)
@@ -169,7 +169,7 @@ void CController::closeTab(Panel p, TabId tabId)
 	savePanelState(p);
 }
 
-void CController::setActiveTab(Panel p, TabId tabId)
+void CController::setActiveTab(Panel p, qulonglong tabId)
 {
 	auto& tabList = _panels[(size_t)p];
 	if (tabList.tabs[tabList.activeTab]->id() == tabId)
@@ -179,7 +179,7 @@ void CController::setActiveTab(Panel p, TabId tabId)
 	savePanelState(p);
 }
 
-void CController::switchActiveTab(Panel p, TabId tabId)
+void CController::switchActiveTab(Panel p, qulonglong tabId)
 {
 	auto& tabList = _panels[(size_t)p];
 	const auto idx = tabIndexById(p, tabId);
@@ -190,7 +190,7 @@ void CController::switchActiveTab(Panel p, TabId tabId)
 	tabList.tabs[tabList.activeTab]->setActive(true);
 }
 
-void CController::moveTabPosition(Panel p, TabId tabId, size_t newPosition)
+void CController::moveTabPosition(Panel p, qulonglong tabId, size_t newPosition)
 {
 	auto& tabList = _panels[(size_t)p];
 	const auto idx = tabIndexById(p, tabId);
@@ -216,7 +216,7 @@ void CController::moveTabPosition(Panel p, TabId tabId, size_t newPosition)
 	savePanelState(p);
 }
 
-std::optional<size_t> CController::tabIndexById(Panel p, TabId tabId) const
+std::optional<size_t> CController::tabIndexById(Panel p, qulonglong tabId) const
 {
 	const auto& tabList = _panels[(size_t)p];
 	for (size_t i = 0; i < tabList.tabs.size(); ++i)
@@ -230,31 +230,31 @@ int CController::tabCount(Panel p) const
 	return (int)_panels[(size_t)p].tabs.size();
 }
 
-TabId CController::activeTabId(Panel p) const
+qulonglong CController::activeTabId(Panel p) const
 {
 	const auto& tabList = _panels[(size_t)p];
 	return tabList.tabs[tabList.activeTab]->id();
 }
 
-std::vector<TabId> CController::tabIds(Panel p) const
+std::vector<qulonglong> CController::tabIds(Panel p) const
 {
 	const auto& tabList = _panels[(size_t)p];
-	std::vector<TabId> ids;
+	std::vector<qulonglong> ids;
 	ids.reserve(tabList.tabs.size());
 	for (const auto& tab : tabList.tabs)
 		ids.push_back(tab->id());
 	return ids;
 }
 
-QString CController::tabPath(Panel p, TabId tabId) const
+QString CController::tabPath(Panel p, qulonglong tabId) const
 {
 	const auto& tabList = _panels[(size_t)p];
 	const auto idx = tabIndexById(p, tabId);
 	assert_and_return_r(idx.has_value(), QString());
 	return tabList.tabs[*idx]->currentDirPathPosix();
 }
 
-QString CController::tabName(Panel p, TabId tabId) const
+QString CController::tabName(Panel p, qulonglong tabId) const
 {
 	const auto& tabList = _panels[(size_t)p];
 	const auto idx = tabIndexById(p, tabId);

file-commander-core/src/ccontroller.h

@@ -45,23 +45,23 @@ class CController final : public CVolumeEnumerator::IVolumeListObserver, public
 	// Updates the list of files in the current directory this panel is viewing, and send the new state to UI
 	void refreshPanelContents(Panel p);
 	// Tab management. A tab is an independent CPanel; panel(p) returns the active tab's CPanel for side p.
-	// Tabs are identified by TabId, not by position: the underlying tab list may be reordered/resized freely
+	// Tabs are identified by tab ID, not by position: the underlying tab list may be reordered/resized freely
 	// without invalidating an id a caller is holding onto.
 	// Creates a new tab for side p showing 'path' and returns its id. Active by default; pass activate=false
 	// to leave the currently active tab as is (e. g. for a background tab opened via middle-click).
-	TabId addTab(Panel p, const QString& path, bool activate = true);
+	qulonglong addTab(Panel p, const QString& path, bool activate = true);
 	// Closes the tab with id. Never removes the last tab (a panel always keeps >= 1 tab).
-	void closeTab(Panel p, TabId tabId);
+	void closeTab(Panel p, qulonglong tabId);
 	// Makes tabId the active tab for side p (deactivates the previously active tab, activates the new one).
-	void setActiveTab(Panel p, TabId tabId);
+	void setActiveTab(Panel p, qulonglong tabId);
 	// Moves the tab with id to newPosition within side p's tab list (e. g. to mirror a drag-reorder in the UI).
 	// No-op if tabId is already at newPosition. newPosition must be a valid index (same semantics as QTabBar::tabMoved's 'to').
-	void moveTabPosition(Panel p, TabId tabId, size_t newPosition);
+	void moveTabPosition(Panel p, qulonglong tabId, size_t newPosition);
 	[[nodiscard]] int tabCount(Panel p) const;
-	[[nodiscard]] TabId activeTabId(Panel p) const;
-	[[nodiscard]] std::vector<TabId> tabIds(Panel p) const; // Tab ids in display order, for the UI to (re)build its tab strip
-	[[nodiscard]] QString tabPath(Panel p, TabId tabId) const;
-	[[nodiscard]] QString tabName(Panel p, TabId tabId) const; // The tab's folder name, for the tab label
+	[[nodiscard]] qulonglong activeTabId(Panel p) const;
+	[[nodiscard]] std::vector<qulonglong> tabIds(Panel p) const; // Tab ids in display order, for the UI to (re)build its tab strip
+	[[nodiscard]] QString tabPath(Panel p, qulonglong tabId) const;
+	[[nodiscard]] QString tabName(Panel p, qulonglong tabId) const; // The tab's folder name, for the tab label
 	// Indicates that an item was activated and appropriate action should be taken.  Returns error message, if any
 	FileOperationResultCode itemActivated(qulonglong itemHash, Panel p);
 	// A current volume has been switched
@@ -151,9 +151,9 @@ class CController final : public CVolumeEnumerator::IVolumeListObserver, public
 	void attachListenersToTab(Panel p, CPanel& tab);
 	// Deactivates the currently active tab and activates tabId. Shared by addTab and setActiveTab; callers are
 	// responsible for skipping the call when tabId is already the active tab.
-	void switchActiveTab(Panel p, TabId tabId);
+	void switchActiveTab(Panel p, qulonglong tabId);
 	// Returns tabId's position within side p's tab list, or nullopt if not found (should never happen for a live id).
-	[[nodiscard]] std::optional<size_t> tabIndexById(Panel p, TabId tabId) const;
+	[[nodiscard]] std::optional<size_t> tabIndexById(Panel p, qulonglong tabId) const;
 
 	// Persistence (centralized here; CPanel no longer touches settings).
 	void restorePanelState(Panel p); // Rebuilds side p's tabs from settings (with migration from the legacy single-path keys)
@@ -170,7 +170,7 @@ class CController final : public CVolumeEnumerator::IVolumeListObserver, public
 	// Shared worker pool for all panel tabs. Declared before _panels so it outlives the CPanels that post tasks to it.
 	CWorkerThreadPool    _panelWorkerPool;
 	std::array<TabList, 2> _panels;
-	TabId                  _nextTabId = 1; // 0 is reserved as "no tab"/invalid
+	qulonglong             _nextTabId = 1; // 0 is reserved as "no tab"/invalid
 	// Listeners attached to every tab of a side; recorded so tabs created later also get them.
 	std::array<std::vector<PanelContentsChangedListener*>, 2> _panelContentsListeners;
 	std::array<std::vector<CursorPositionListener*>, 2> _cursorPositionListeners;

file-commander-core/src/cpanel.cpp

@@ -22,7 +22,7 @@ enum {
 	ItemDiscoveryProgressNotificationTag
 };
 
-CPanel::CPanel(Panel position, CWorkerThreadPool& workerThreadPool, TabId id) :
+CPanel::CPanel(Panel position, CWorkerThreadPool& workerThreadPool, qulonglong id) :
 	_panelPosition(position),
 	_id(id),
 	// The panel's own address is a unique, non-zero pool tag. Reuse-safe: ~CPanel retires all of this tag's tasks
@@ -39,7 +39,7 @@ CPanel::~CPanel()
 	_workerThreadPool.retire(_taskTag);
 }
 
-TabId CPanel::id() const noexcept
+qulonglong CPanel::id() const noexcept
 {
 	return _id;
 }

file-commander-core/src/cpanel.h

@@ -30,8 +30,6 @@ enum class Panel
 	UnknownPanel
 };
 
-using TabId = uint64_t; // Stable identifier for a CPanel-as-tab, assigned once by CController when the tab is created
-
 enum FileListRefreshCause
 {
 	refreshCauseForwardNavigation,
@@ -71,10 +69,10 @@ class CPanel final
 	void addCurrentItemChangeListener(CursorPositionListener * listener);
 	void addCurrentPathChangedListener(CurrentPathChangedListener * listener);
 
-	explicit CPanel(Panel position, CWorkerThreadPool& workerThreadPool, TabId id);
+	explicit CPanel(Panel position, CWorkerThreadPool& workerThreadPool, qulonglong id);
 	~CPanel();
 
-	[[nodiscard]] TabId id() const noexcept; // Stable per-tab identifier; never changes for this CPanel's lifetime
+	[[nodiscard]] qulonglong id() const noexcept; // Stable per-tab identifier; never changes for this CPanel's lifetime
 
 	// Seeds the navigation history when restoring a tab from saved settings. The controller owns persistence now,
 	// so CPanel no longer reads or writes QSettings itself.
@@ -146,7 +144,7 @@ class CPanel final
 	CallbackCaller<CursorPositionListener>     _currentItemChangeListener;
 	CallbackCaller<CurrentPathChangedListener> _currentPathChangedListeners;
 	const Panel                                _panelPosition;
-	const TabId                                _id; // Stable identity for this tab; assigned by CController. Distinct from _taskTag below.
+	const qulonglong                           _id; // Stable identity for this tab; assigned by CController. Distinct from _taskTag below.
 	const uint64_t                             _taskTag; // Unique per panel; tags this panel's tasks in the shared pool so they can be retired when the panel is destroyed
 	CurrentDisplayMode                         _currentDisplayMode = NormalMode;
 

qt-app/src/panel/cpanelwidget.cpp

@@ -171,12 +171,12 @@ void CPanelWidget::initPanel(Panel p)
 	assert_r(connect(ui->_tabBar, &QTabBar::customContextMenuRequested, this, &CPanelWidget::showContextMenuForTab));
 
 	// Mirror however many tabs CController restored for this side (usually one, but persisted multi-tab state may have more).
-	const std::vector<TabId> ids = _controller->tabIds(p);
-	const TabId activeId = _controller->activeTabId(p);
+	const std::vector<qulonglong> ids = _controller->tabIds(p);
+	const qulonglong activeId = _controller->activeTabId(p);
 	int activeIndex = 0;
 	{
 		const QSignalBlocker block(ui->_tabBar);
-		for (const TabId id : ids)
+		for (const qulonglong id : ids)
 		{
 			PanelTab& tab = _tabs.emplace_back();
 			populateTriplet(tab);
@@ -299,7 +299,7 @@ void CPanelWidget::tryOpenItemInNewTab(const QModelIndex& sortModelIndex, bool a
 
 void CPanelWidget::openPathInNewTab(const QString& path, bool activate)
 {
-	const TabId id = _controller->addTab(_panelPosition, path, activate);
+	const qulonglong id = _controller->addTab(_panelPosition, path, activate);
 
 	PanelTab& tab = _tabs.emplace_back();
 	populateTriplet(tab);
@@ -364,7 +364,7 @@ void CPanelWidget::onTabBarCloseRequested(int index)
 	closeTabById(tabIdAt(index));
 }
 
-void CPanelWidget::closeTabById(TabId id)
+void CPanelWidget::closeTabById(qulonglong id)
 {
 	if (_tabs.size() <= 1)
 		return;
@@ -392,7 +392,7 @@ void CPanelWidget::closeTabById(TabId id)
 		_tabs[(size_t)_activeTab].headerState = ui->_list->header()->saveState();
 
 	_controller->closeTab(_panelPosition, id);
-	const TabId activeId = _controller->activeTabId(_panelPosition); // post-removal active tab
+	const qulonglong activeId = _controller->activeTabId(_panelPosition); // post-removal active tab
 
 	// Detach the view from the closing triplet (via activateTab below) BEFORE deleting it.
 	const PanelTab closing = _tabs[(size_t)index];
@@ -426,7 +426,7 @@ void CPanelWidget::onTabBarTabMoved(int from, int to)
 	if (from == to)
 		return;
 
-	// By the time this signal fires, the QTabBar (and the per-tab data carrying its TabId) has already moved
+	// By the time this signal fires, the QTabBar (and the per-tab data carrying its tab ID) has already moved
 	// the tab internally -- mirror the same reorder into _tabs, which has no notion of its own beyond position.
 	PanelTab movedTab = std::move(_tabs[(size_t)from]);
 	_tabs.erase(_tabs.begin() + from);
@@ -470,16 +470,16 @@ void CPanelWidget::closeAllOtherTabs(int index)
 {
 	assert_and_return_r(index >= 0 && index < (int)_tabs.size(), );
 
-	const TabId keepId = tabIdAt(index);
-	std::vector<TabId> idsToClose;
+	const qulonglong keepId = tabIdAt(index);
+	std::vector<qulonglong> idsToClose;
 	for (int i = 0; i < ui->_tabBar->count(); ++i)
 	{
-		const TabId id = tabIdAt(i);
+		const qulonglong id = tabIdAt(i);
 		if (id != keepId)
 			idsToClose.push_back(id);
 	}
 
-	for (const TabId id : idsToClose)
+	for (const qulonglong id : idsToClose)
 		closeTabById(id);
 }
 
@@ -494,7 +494,7 @@ void CPanelWidget::updateTabText(int index)
 		ui->_tabBar->setTabText(index, _controller->tabName(_panelPosition, tabIdAt(index)));
 }
 
-TabId CPanelWidget::tabIdAt(int index) const
+qulonglong CPanelWidget::tabIdAt(int index) const
 {
 	return ui->_tabBar->tabData(index).toULongLong();
 }

qt-app/src/panel/cpanelwidget.h

@@ -49,7 +49,7 @@ class CPanelWidget final : public QWidget,
 	void initPanel(Panel p);
 
 	// Tabs (this side). The QTabBar and the per-tab model triplets (_tabs) are kept position-aligned with each
-	// other; CController's tabs are addressed by TabId, recovered from a QTabBar position via tabIdAt().
+	// other; CController's tabs are addressed by tab ID, recovered from a QTabBar position via tabIdAt().
 	void createNewTab();          // New tab showing the current folder, switched to
 	void closeCurrentTab();       // Closes the active tab (no-op when it's the only one)
 	void switchToNextTab();
@@ -122,20 +122,20 @@ private slots:
 
 	[[nodiscard]] bool pasteImage(const QImage& image, bool lossyCompression);
 
-// Tab helpers (UI side; _tabs is position-aligned with the QTabBar; CController is addressed by TabId, see tabIdAt())
+// Tab helpers (UI side; _tabs is position-aligned with the QTabBar; CController is addressed by tab ID, see tabIdAt())
 	struct PanelTab {
 		CFileListModel* model = nullptr;
 		CFileListSortFilterProxyModel* sortModel = nullptr;
 		QItemSelectionModel* selectionModel = nullptr;
 		QByteArray headerState; // This tab's own column widths/order/visibility (sort indicator bits in here are ignored - sortModel owns the sort)
 	};
 	void populateTriplet(PanelTab& tab);            // Wires a model / sort-proxy / selection-model trio into an already-emplaced tab (not shown yet)
-	[[nodiscard]] TabId tabIdAt(int index) const;   // The TabId stored as this QTabBar position's tab data
+	[[nodiscard]] qulonglong tabIdAt(int index) const; // The tab ID stored as this QTabBar position's tab data
 	void activateTab(int index);                   // Points the shared view at tab 'index's triplet, restoring its own column widths and sort
 	void onTabBarCurrentChanged(int index);
 	void onTabBarCloseRequested(int index);
 	void onTabBarTabMoved(int from, int to);        // Drag-reorder: mirrors the QTabBar's move into _tabs and CController
-	void closeTabById(TabId id);            // Closes whichever tab currently holds id (re-resolves its position fresh); shared by onTabBarCloseRequested and closeAllOtherTabs
+	void closeTabById(qulonglong id);       // Closes whichever tab currently holds id (re-resolves its position fresh); shared by onTabBarCloseRequested and closeAllOtherTabs
 	void updateTabBarVisibility();                 // The bar stays hidden while there's only one tab
 	void updateTabText(int index);
 	void openPathInNewTab(const QString& path, bool activate = true); // Shared by createNewTab() and openCurrentItemInNewTab()/onItemMiddleClicked(); activate=false keeps the new tab in the background