summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/array.h5
-rw-r--r--src/config.cpp2
-rw-r--r--src/export.cpp7
-rw-r--r--src/image.h5
-rw-r--r--src/import.cpp7
-rw-r--r--src/main.cpp6
-rw-r--r--src/memory_bucket.h5
-rw-r--r--src/mutex.h5
-rw-r--r--src/platform.h7
-rw-r--r--src/search.cpp10
-rw-r--r--src/search.h5
-rw-r--r--src/unix/main_unix.cpp6
-rw-r--r--src/windows/main_windows.cpp14
13 files changed, 34 insertions, 50 deletions
diff --git a/src/array.h b/src/array.h
index 9e82e62..b25e7fa 100644
--- a/src/array.h
+++ b/src/array.h
@@ -1,5 +1,4 @@
-#ifndef INCLUDE_ts_array
-#define INCLUDE_ts_array
+#pragma once
#include "mutex.h"
#include <cassert>
@@ -25,5 +24,3 @@ void* ts_array_at(ts_array *ts_array, uint32_t at);
void ts_array_destroy(ts_array *ts_array);
void ts_array_reserve(ts_array *ts_array, uint32_t reserve_count);
ts_array ts_array_copy(ts_array *ts_array);
-
-#endif \ No newline at end of file
diff --git a/src/config.cpp b/src/config.cpp
index 017891a..4c5533d 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -66,7 +66,7 @@ void ts_load_config() {
ImGuiSettingsHandler ini_handler;
ini_handler.TypeName = "Query";
ini_handler.TypeHash = ImHashStr("Query");
- ini_handler.ClearAllFn = nullptr;
+ ini_handler.ClearAllFn = NULL;
ini_handler.ReadOpenFn = _ts_config_ReadOpen;
ini_handler.ReadLineFn = _ts_config_ReadLine;
ini_handler.ApplyAllFn = _ts_config_ApplyAll;
diff --git a/src/export.cpp b/src/export.cpp
index 67388fb..9b7cf9b 100644
--- a/src/export.cpp
+++ b/src/export.cpp
@@ -3,6 +3,7 @@
#include "config.h"
#include "../imfiledialog/ImFileDialog.h"
#include <stdio.h>
+#include <inttypes.h>
export_result last_export_result = EXPORT_NONE;
@@ -70,7 +71,7 @@ static bool _ts_export_json(ts_search_result* result, const utf8_int8_t* path) {
fprintf(write_file, "\"casesensitive\": %u,\n", result->respect_capitalization);
fprintf(write_file, "\"match_count\": %u,\n", result->match_count);
fprintf(write_file, "\"file_count\": %u,\n", result->file_count);
- fprintf(write_file, "\"timestamp\": %llu,\n", result->timestamp);
+ fprintf(write_file, "\"timestamp\": %" PRId64 ",\n", result->timestamp);
fprintf(write_file, "\"files\": [\n");
@@ -136,7 +137,7 @@ static bool _ts_export_csv(ts_search_result* result, const utf8_int8_t* path) {
fprintf(write_file, "CASESENSITIVE,%u\n", result->respect_capitalization);
fprintf(write_file, "MATCH_COUNT,%u\n", result->match_count);
fprintf(write_file, "FILE_COUNT,%u\n", result->file_count);
- fprintf(write_file, "TIMESTAMP,%llu\n", result->timestamp);
+ fprintf(write_file, "TIMESTAMP,%" PRId64 "\n", result->timestamp);
// Empty files.
for (uint32_t i = 0; i < result->files.length; i++) {
@@ -199,7 +200,7 @@ static bool _ts_export_xml(ts_search_result* result, const utf8_int8_t* path) {
fprintf(write_file, "<CASESENSITIVE>%u</CASESENSITIVE>\n", result->respect_capitalization);
fprintf(write_file, "<MATCH_COUNT>%u</MATCH_COUNT>\n", result->match_count);
fprintf(write_file, "<FILE_COUNT>%u</FILE_COUNT>\n", result->file_count);
- fprintf(write_file, "<TIMESTAMP>%llu</TIMESTAMP>\n", result->timestamp);
+ fprintf(write_file, "<TIMESTAMP>%" PRId64 "</TIMESTAMP>\n", result->timestamp);
// Empty files.
for (uint32_t i = 0; i < result->files.length; i++) {
diff --git a/src/image.h b/src/image.h
index 6f99936..0e7c4c1 100644
--- a/src/image.h
+++ b/src/image.h
@@ -1,5 +1,4 @@
-#ifndef INCLUDE_IMAGE
-#define INCLUDE_IMAGE
+#pragma once
#include <cstdint>
@@ -36,5 +35,3 @@ extern ts_image img_folder;
extern ts_image img_drop;
void ts_load_images();
-
-#endif \ No newline at end of file
diff --git a/src/import.cpp b/src/import.cpp
index d6bc09a..0eec700 100644
--- a/src/import.cpp
+++ b/src/import.cpp
@@ -5,6 +5,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <inttypes.h>
import_result last_import_result = IMPORT_NONE;
@@ -31,7 +32,7 @@ static import_result _ts_import_csv_v1(ts_search_result* result, FILE *read_file
fscanf_required(read_file, "CASESENSITIVE,%d\n", 1, (int*)&result->respect_capitalization);
fscanf_required(read_file, "MATCH_COUNT,%u\n", 1, &result->match_count);
fscanf_required(read_file, "FILE_COUNT,%u\n", 1, &result->file_count);
- fscanf_required(read_file, "TIMESTAMP,%llu\n", 1, &result->timestamp);
+ fscanf_required(read_file, "TIMESTAMP,%" PRId64 "\n", 1, &result->timestamp);
utf8ncpy(path_buffer, result->directory_to_search, MAX_INPUT_LENGTH);
utf8ncpy(filter_buffer, result->file_filter, MAX_INPUT_LENGTH);
@@ -39,7 +40,7 @@ static import_result _ts_import_csv_v1(ts_search_result* result, FILE *read_file
result->filters = ts_get_filters(result->file_filter);
if (utf8len(result->search_text) == 0) {
- result->search_text = nullptr;
+ result->search_text = NULL;
}
// Read results
@@ -178,7 +179,7 @@ void ts_create_import_popup(int window_w, int window_h) {
ifd::FileDialog::Instance().Close();
}
- if (last_import_result != EXPORT_NONE) {
+ if (last_import_result != IMPORT_NONE) {
ImGui::OpenPopup("Import Failed");
ImGuiIO& io = ImGui::GetIO();
ImGui::SetNextWindowPos(ImVec2(io.DisplaySize.x * 0.5f, io.DisplaySize.y * 0.5f), ImGuiCond_Always, ImVec2(0.5f,0.5f));
diff --git a/src/main.cpp b/src/main.cpp
index ee73d7e..0828859 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -267,7 +267,7 @@ void _ts_create_file_error_rows() {
void _ts_create_text_match_rows() {
uint32_t itemcount = current_search_result == 0 ? 0 : current_search_result->matches.length;
- ts_found_file* prev_file = nullptr;
+ ts_found_file* prev_file = NULL;
for (uint32_t item = 0; item < itemcount; item++)
{
ts_file_match *match = (ts_file_match *)ts_array_at(&current_search_result->matches, item);
@@ -448,7 +448,7 @@ int _ts_create_textbox_area(int window_w, int window_h, int textbox_area_height,
void _ts_update_dragdrop() {
if (ImGui::BeginDragDropSource(ImGuiDragDropFlags_SourceExtern)) // we use an external source (i.e. not ImGui-created)
{
- ImGui::SetDragDropPayload("FILES", nullptr, 0);
+ ImGui::SetDragDropPayload("FILES", NULL, 0);
ImGui::EndDragDropSource();
}
@@ -535,7 +535,7 @@ void ts_create_gui(int window_w, int window_h) {
ImGui::TableHeadersRow();
- if (current_search_result->search_text == nullptr) _ts_create_file_match_rows();
+ if (current_search_result->search_text == NULL) _ts_create_file_match_rows();
else _ts_create_text_match_rows();
if (current_search_result->search_completed && (current_search_result->files.length == 0 || current_search_result->match_count == 0)) {
diff --git a/src/memory_bucket.h b/src/memory_bucket.h
index e5f18e5..2744eb5 100644
--- a/src/memory_bucket.h
+++ b/src/memory_bucket.h
@@ -1,5 +1,4 @@
-#ifndef INCLUDE_MEMORY_BUCKET
-#define INCLUDE_MEMORY_BUCKET
+#pragma once
#define kilobytes(num) num*1000
#define megabytes(num) kilobytes(num*1000)
@@ -24,5 +23,3 @@ ts_memory_bucket ts_memory_bucket_init(uint32_t bucket_size);
void* ts_memory_bucket_reserve(ts_memory_bucket *bucket, uint32_t reserve_length);
void ts_memory_bucket_reset(ts_memory_bucket *bucket);
void ts_memory_bucket_destroy(ts_memory_bucket *bucket);
-
-#endif \ No newline at end of file
diff --git a/src/mutex.h b/src/mutex.h
index 31a0026..a6a96e6 100644
--- a/src/mutex.h
+++ b/src/mutex.h
@@ -1,5 +1,4 @@
-#ifndef INCLUDE_MUTEX
-#define INCLUDE_MUTEX
+#pragma once
#if defined(_WIN32)
#define _CRT_SECURE_NO_WARNINGS
@@ -53,5 +52,3 @@ void ts_mutex_lock(ts_mutex *ts_mutex);
bool ts_mutex_trylock(ts_mutex *ts_mutex);
void ts_mutex_unlock(ts_mutex *ts_mutex);
void ts_mutex_destroy(ts_mutex *ts_mutex);
-
-#endif \ No newline at end of file
diff --git a/src/platform.h b/src/platform.h
index 5d2711e..3a3b33e 100644
--- a/src/platform.h
+++ b/src/platform.h
@@ -1,5 +1,4 @@
-#ifndef INCLUDE_PLATFORM
-#define INCLUDE_PLATFORM
+#pragma once
#include "array.h"
#include "memory_bucket.h"
@@ -43,10 +42,8 @@ extern ts_dragdrop_data dragdrop_data;
bool ts_platform_dir_exists(utf8_int8_t* dir);
ts_file_content ts_platform_read_file(char *path, const char *mode);
-void ts_platform_list_files_block(ts_search_result* result, wchar_t* start_dir = nullptr);
+void ts_platform_list_files_block(ts_search_result* result, wchar_t* start_dir = NULL);
uint64_t ts_platform_get_time(uint64_t compare = 0); // if compare is not 0, return difference between timestamp and now, in milliseconds.
void ts_platform_open_file_as(utf8_int8_t* str);
void ts_platform_open_file_in_folder(utf8_int8_t* file);
void ts_platform_set_window_title(utf8_int8_t* str);
-
-#endif \ No newline at end of file
diff --git a/src/search.cpp b/src/search.cpp
index 5138f3b..5f95e8e 100644
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -3,7 +3,7 @@
#include "config.h"
#include <stdio.h>
-ts_search_result *current_search_result = nullptr;
+ts_search_result *current_search_result = NULL;
ts_array ts_get_filters(utf8_int8_t *pattern)
{
@@ -314,7 +314,7 @@ static void _ts_search_file(ts_found_file *ref, ts_file_content content, ts_sear
static void *_ts_search_thread(void *args)
{
ts_search_result *new_result = (ts_search_result *)args;
- if (new_result->search_text == nullptr) goto finish_early;
+ if (new_result->search_text == NULL) goto finish_early;
while (new_result->file_list_read_cursor < new_result->files.length || !new_result->done_finding_files)
{
@@ -369,7 +369,7 @@ void ts_destroy_result(ts_search_result* result) {
static void *_ts_list_files_thread(void *args)
{
ts_search_result *info = (ts_search_result *)args;
- ts_platform_list_files_block(info, nullptr);
+ ts_platform_list_files_block(info, NULL);
info->done_finding_files = true;
// Use this thread to cleanup previous result.
@@ -378,7 +378,7 @@ static void *_ts_list_files_thread(void *args)
ts_thread_sleep(10);
}
ts_destroy_result(info->prev_result);
- info->prev_result = nullptr;
+ info->prev_result = NULL;
}
// Use this thread to sync.
@@ -420,7 +420,7 @@ void ts_start_search(utf8_int8_t *path, utf8_int8_t *filter, utf8_int8_t *query,
new_result->respect_capitalization = case_sensitive;
if (utf8len(query) == 0) {
- new_result->search_text = nullptr;
+ new_result->search_text = NULL;
}
_ts_list_files(new_result);
diff --git a/src/search.h b/src/search.h
index ac4a3eb..27c7f04 100644
--- a/src/search.h
+++ b/src/search.h
@@ -1,5 +1,4 @@
-#ifndef INCLUDE_SEARCH
-#define INCLUDE_SEARCH
+#pragma once
#include "array.h"
#include "memory_bucket.h"
@@ -70,5 +69,3 @@ ts_search_result* ts_create_empty_search_result();
bool ts_string_contains(utf8_int8_t *text_to_search, utf8_int8_t *text_to_find, ts_array *text_matches, bool respect_capitalization);
void ts_start_search(utf8_int8_t *path, utf8_int8_t *filter, utf8_int8_t *query, uint16_t thread_count, uint32_t max_file_size, bool respect_capitalization);
void ts_destroy_result(ts_search_result* result);
-
-#endif \ No newline at end of file
diff --git a/src/unix/main_unix.cpp b/src/unix/main_unix.cpp
index 82d9b6d..8f4ac04 100644
--- a/src/unix/main_unix.cpp
+++ b/src/unix/main_unix.cpp
@@ -94,8 +94,8 @@ int main(int, char**)
#endif
// Create window with graphics context
- GLFWwindow* window = glfwCreateWindow(1280, 720, "Text-Search", nullptr, nullptr);
- if (window == nullptr) {
+ GLFWwindow* window = glfwCreateWindow(1280, 720, "Text-Search", NULL, NULL);
+ if (window == NULL) {
return 1;
}
glfw_window = window;
@@ -242,7 +242,7 @@ ts_file_content ts_platform_read_file(char *path, const char *mode) {
void ts_platform_list_files_block(ts_search_result* result, wchar_t* start_dir) {
utf8_int8_t* search_dir = (utf8_int8_t*)ts_memory_bucket_reserve(&result->memory, MAX_INPUT_LENGTH);
- if (start_dir == nullptr) {
+ if (start_dir == NULL) {
strcpy(search_dir, result->directory_to_search);
}
else {
diff --git a/src/windows/main_windows.cpp b/src/windows/main_windows.cpp
index c47403a..4b086e8 100644
--- a/src/windows/main_windows.cpp
+++ b/src/windows/main_windows.cpp
@@ -119,9 +119,9 @@ int main(int, char**)
// Create application window
//ImGui_ImplWin32_EnableDpiAwareness();
- WNDCLASSEXW wc = { sizeof(wc), CS_OWNDC, WndProc, 0L, 0L, GetModuleHandle(nullptr), nullptr, nullptr, nullptr, nullptr, L"ImGui Example", nullptr };
+ WNDCLASSEXW wc = { sizeof(wc), CS_OWNDC, WndProc, 0L, 0L, GetModuleHandle(NULL), NULL, NULL, NULL, NULL, L"ImGui Example", NULL };
::RegisterClassExW(&wc);
- HWND hwnd = ::CreateWindowW(wc.lpszClassName, L"Text-Search", WS_OVERLAPPEDWINDOW, 100, 100, 1280, 800, nullptr, nullptr, wc.hInstance, nullptr);
+ HWND hwnd = ::CreateWindowW(wc.lpszClassName, L"Text-Search", WS_OVERLAPPEDWINDOW, 100, 100, 1280, 800, NULL, NULL, wc.hInstance, NULL);
window_handle = hwnd;
// Initialize OpenGL
@@ -169,7 +169,7 @@ int main(int, char**)
while (program_running)
{
MSG msg;
- while (::PeekMessage(&msg, nullptr, 0U, 0U, PM_REMOVE))
+ while (::PeekMessage(&msg, NULL, 0U, 0U, PM_REMOVE))
{
::TranslateMessage(&msg);
::DispatchMessage(&msg);
@@ -226,7 +226,7 @@ bool CreateDeviceWGL(HWND hWnd, WGL_WindowData* data)
void CleanupDeviceWGL(HWND hWnd, WGL_WindowData* data)
{
- wglMakeCurrent(nullptr, nullptr);
+ wglMakeCurrent(NULL, NULL);
::ReleaseDC(hWnd, data->hDC);
}
@@ -357,7 +357,7 @@ void ts_platform_list_files_block(ts_search_result* result, wchar_t* start_dir)
{
// Utf8 to wchar str
wchar_t* search_dir = (wchar_t*)ts_memory_bucket_reserve(&result->memory, MAX_INPUT_LENGTH);
- if (start_dir == nullptr) {
+ if (start_dir == NULL) {
MultiByteToWideChar(CP_UTF8, 0, result->directory_to_search, -1, search_dir, MAX_INPUT_LENGTH);
}
else {
@@ -444,10 +444,10 @@ void ts_platform_open_file_as(utf8_int8_t* str) {
MultiByteToWideChar(CP_UTF8, 0, str, -1, convstr, MAX_INPUT_LENGTH);
info.pcszFile = convstr;
- info.pcszClass = nullptr;
+ info.pcszClass = NULL;
info.oaifInFlags = OAIF_EXEC;
- SHOpenWithDialog(nullptr, &info);
+ SHOpenWithDialog(NULL, &info);
}
void ts_platform_open_file_in_folder(utf8_int8_t* file) {
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-12-06 11:11:06 +0000