diff options
Diffstat (limited to 'plugins/Clist_modern/src/modern_row.cpp')
| -rw-r--r-- | plugins/Clist_modern/src/modern_row.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/plugins/Clist_modern/src/modern_row.cpp b/plugins/Clist_modern/src/modern_row.cpp index 9ae57aa286..e5406aea4a 100644 --- a/plugins/Clist_modern/src/modern_row.cpp +++ b/plugins/Clist_modern/src/modern_row.cpp @@ -44,13 +44,13 @@ ROWCELL *cppInitModernRow(ROWCELL ** tabAccess) { int fsize; int seq = 0; - ROWCELL * RowRoot = NULL; + ROWCELL * RowRoot = nullptr; FILE * hFile; int i = 0; - if (!db_get_b(NULL, "ModernData", "UseAdvancedRowLayout", SETTING_ROW_ADVANCEDLAYOUT_DEFAULT)) return NULL; - tmplbuf = NULL; - if (db_get_b(NULL, "ModernData", "UseAdvancedRowLayout", SETTING_ROW_ADVANCEDLAYOUT_DEFAULT) == 1) - tmplbuf = db_get_sa(NULL, "ModernData", "RowTemplate"); + if (!db_get_b(0, "ModernData", "UseAdvancedRowLayout", SETTING_ROW_ADVANCEDLAYOUT_DEFAULT)) return nullptr; + tmplbuf = nullptr; + if (db_get_b(0, "ModernData", "UseAdvancedRowLayout", SETTING_ROW_ADVANCEDLAYOUT_DEFAULT) == 1) + tmplbuf = db_get_sa(0, "ModernData", "RowTemplate"); if (tmplbuf) { rowParse(RowRoot, RowRoot, tmplbuf, i, seq, tabAccess); mir_free(tmplbuf); @@ -66,12 +66,12 @@ ROWCELL *cppInitModernRow(ROWCELL ** tabAccess) tmplbuf[i] = 0; i = 0; rowParse(RowRoot, RowRoot, tmplbuf, i, seq, tabAccess); - db_set_s(NULL, "ModernData", "RowTemplate", tmplbuf); + db_set_s(0, "ModernData", "RowTemplate", tmplbuf); free(tmplbuf); fclose(hFile); return RowRoot; } - return NULL; + return nullptr; } @@ -83,7 +83,7 @@ void cppDeleteTree(ROWCELL * RowRoot) int cppCalculateRowHeight(ROWCELL *RowRoot) { - if (RowRoot == NULL) + if (RowRoot == nullptr) return 0; RowRoot->h = 0; RowRoot->w = 0; @@ -125,7 +125,7 @@ void rowDeleteTree(ROWCELL* cell) if (cell->next) rowDeleteTree((ROWCELL*)(cell->next)); free(cell); - cell = NULL; + cell = nullptr; return; } @@ -188,7 +188,7 @@ char * rowParserGetNextWord(char *tbuf, int &hbuf) } hbuf++; } - return NULL; + return nullptr; } // rowParserGetParam @@ -324,7 +324,7 @@ BOOL rowParse(ROWCELL* &cell, ROWCELL* parent, char *tbuf, int &hbuf, int &seque if (!parent) { - RowTabAccess[sequence] = NULL; + RowTabAccess[sequence] = nullptr; return TRUE; } @@ -357,7 +357,7 @@ void rowResetEmptyRects(ROWCELL* cell) // void rowCalculateMinSize(ROWCELL* cell) { - ROWCELL* curchild = NULL; + ROWCELL* curchild = nullptr; int w = 0, h = 0; int wl = 0, hl = 0; int fullWidth = 0; @@ -431,7 +431,7 @@ void rowCalculateMinSize(ROWCELL* cell) // void rowEqualize(ROWCELL* cell) { - ROWCELL* curchild = NULL; + ROWCELL* curchild = nullptr; if (!cell) return; rowEqualize(cell->child); rowEqualize(cell->next); @@ -557,7 +557,7 @@ void rowLayerProc(pROWCELL cell, pROWCELL parent) // void rowPositioning(pROWCELL cell, int &dist) { - ROWCELL* curchild = NULL; + ROWCELL* curchild = nullptr; int x = cell->r.left; int y = cell->r.top; |