From 3447a9bff3aa6ba3a2d9bab91653cab257c29bcf Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 7 Jul 2012 07:02:09 +0000 Subject: more autoformatter fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@807 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/modern_clui.cpp | 4 ++-- plugins/Clist_modern/modern_gdiplus.cpp | 2 +- plugins/Clist_modern/modern_log.cpp | 6 +++--- plugins/Clist_modern/modern_row.cpp | 30 +++++++++++++------------- plugins/Clist_modern/modern_rowtemplateopt.cpp | 2 +- plugins/Clist_modern/modern_skinengine.cpp | 2 +- plugins/Clist_modern/modern_tbbutton.cpp | 2 +- plugins/Clist_modern/modern_viewmodebar.cpp | 4 ++-- plugins/Clist_modern/resource.rc | 4 ++-- plugins/Clist_modern/version.rc | 2 +- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/plugins/Clist_modern/modern_clui.cpp b/plugins/Clist_modern/modern_clui.cpp index e4d6c2691a..e4e8e1d550 100644 --- a/plugins/Clist_modern/modern_clui.cpp +++ b/plugins/Clist_modern/modern_clui.cpp @@ -33,7 +33,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "hdr/modern_statusbar.h" #include "hdr/modern_static_clui.h" -#include < locale.h> +#include #include "hdr/modern_clcpaint.h" #include "hdr/modern_sync.h" @@ -45,7 +45,7 @@ void DestroyTrayMenu(HMENU hMenu); // new sources #ifdef _MSC_VER -#include < crtdbg.h> +#include #endif //////////////// CLUI CLASS IMPLEMENTATION ///////////////////////////////// diff --git a/plugins/Clist_modern/modern_gdiplus.cpp b/plugins/Clist_modern/modern_gdiplus.cpp index e9b9446d33..1b8a1acd27 100644 --- a/plugins/Clist_modern/modern_gdiplus.cpp +++ b/plugins/Clist_modern/modern_gdiplus.cpp @@ -6,7 +6,7 @@ #include "hdr/modern_commonheaders.h" #undef Translate //otherwise will conflict with gdi plus Translate -#include < gdiplus.h> +#include #include "hdr/modern_global_structure.h" diff --git a/plugins/Clist_modern/modern_log.cpp b/plugins/Clist_modern/modern_log.cpp index 09e7e1dd6d..af2b9c9a68 100644 --- a/plugins/Clist_modern/modern_log.cpp +++ b/plugins/Clist_modern/modern_log.cpp @@ -1,8 +1,8 @@ #include "hdr/modern_commonheaders.h" -#include < stdarg.h> -#include < stdio.h> -#include < string.h> +#include +#include +#include void Log(const char *file,int line,const char *fmt,...) diff --git a/plugins/Clist_modern/modern_row.cpp b/plugins/Clist_modern/modern_row.cpp index fe892e767b..ac6bd221e2 100644 --- a/plugins/Clist_modern/modern_row.cpp +++ b/plugins/Clist_modern/modern_row.cpp @@ -29,15 +29,15 @@ Created by Anton Senko aka ZORG , tweaked by Artem Shpynov aka FYR /* #include "m_stdhdr.h" -#include < windows.h> -#include < commctrl.h> -#include < stdio.h> -#include < time.h> -#include < stddef.h> -#include < process.h> -#include < io.h> -#include < string.h> -#include < direct.h> +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "resource.h" #include "hdr/modern_commonheaders.h" */ @@ -184,11 +184,11 @@ char * rowParserGetNextWord(char *tbuf, int &hbuf) // Tag-bracers found if (!(ch == '>' && j < 0)) //not single '>' found { - if ( (ch == ' < ' || ch == '>') && j >= 0) + if ( (ch == '<' || ch == '>') && j >= 0) { if (ch == '>') { - if (buf[0] == '/' || buf[0] == ' < ') buf[++j] = ch; + if (buf[0] == '/' || buf[0] == '<') buf[++j] = ch; hbuf++; } return buf; @@ -328,11 +328,11 @@ BOOL rowParse(ROWCELL* &cell, ROWCELL* parent, char *tbuf, int &hbuf, int &seque word = rowParserGetNextWord(tbuf, hbuf); int cont; - if (!_strnicmp(word, " < tr", strlen(word)) ||!_strnicmp(word, " < tr>", strlen(word))) cont = TC_ROW; - else if (!_strnicmp(word, " < tc", strlen(word)) ||!_strnicmp(word, " < tc>", strlen(word))) cont = TC_COL; + if (!_strnicmp(word, "", strlen(word))) cont = TC_ROW; + else if (!_strnicmp(word, "", strlen(word))) cont = TC_COL; else if (!_strnicmp(word, "/>", strlen(word))|| - !_strnicmp(word, " < /tr>", strlen(word))|| - !_strnicmp(word, " < /tc>", strlen(word))) return TRUE; + !_strnicmp(word, "", strlen(word))|| + !_strnicmp(word, "", strlen(word))) return TRUE; else return FALSE; rowAddCell(cell, cont); diff --git a/plugins/Clist_modern/modern_rowtemplateopt.cpp b/plugins/Clist_modern/modern_rowtemplateopt.cpp index b96d02e8ad..71c877abbe 100644 --- a/plugins/Clist_modern/modern_rowtemplateopt.cpp +++ b/plugins/Clist_modern/modern_rowtemplateopt.cpp @@ -384,7 +384,7 @@ INT_PTR CALLBACK DlgTmplEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM TranslateDialogDefault(hwndDlg); rowOptTmplStr = db_get_sa(NULL, "ModernData", "RowTemplate"); - if (!rowOptTmplStr) rowOptTmplStr = mir_strdup(" < TR />"); + if (!rowOptTmplStr) rowOptTmplStr = mir_strdup(""); { //HIMAGELIST himlTreeIcons; //himlTreeIcons = ImageList_Create(GetSystemMetrics(SM_CXSMICON),GetSystemMetrics(SM_CYSMICON),ILC_COLOR32|ILC_MASK,3,2); diff --git a/plugins/Clist_modern/modern_skinengine.cpp b/plugins/Clist_modern/modern_skinengine.cpp index fa3862e218..1e0e1ab1ee 100644 --- a/plugins/Clist_modern/modern_skinengine.cpp +++ b/plugins/Clist_modern/modern_skinengine.cpp @@ -34,7 +34,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "hdr/modern_skinengine.h" #include "hdr/modern_commonprototypes.h" -#include < shlwapi.h> +#include #include "hdr/modern_sync.h" //Implementation diff --git a/plugins/Clist_modern/modern_tbbutton.cpp b/plugins/Clist_modern/modern_tbbutton.cpp index 5ad2b79401..3082ecf317 100644 --- a/plugins/Clist_modern/modern_tbbutton.cpp +++ b/plugins/Clist_modern/modern_tbbutton.cpp @@ -3,7 +3,7 @@ #include "m_api/m_skinbutton.h" #include "hdr/modern_clcpaint.h" #ifdef __MINGW32__ -#include < ctype.h> +#include #endif #define BUTTON_POLLID 100 diff --git a/plugins/Clist_modern/modern_viewmodebar.cpp b/plugins/Clist_modern/modern_viewmodebar.cpp index a8afbafa04..a81ccad076 100644 --- a/plugins/Clist_modern/modern_viewmodebar.cpp +++ b/plugins/Clist_modern/modern_viewmodebar.cpp @@ -1524,10 +1524,10 @@ void ApplyViewMode(const char *Name, bool onlySelector ) if (id) { if (!DBGetContactSetting(hContact, szProto, id, &dbv)) { if (dbv.type == DBVT_ASCIIZ) { - mir_snprintf(UIN, 256, " < %s:%s>", szProto, dbv.pszVal); + mir_snprintf(UIN, 256, "<%s:%s>", szProto, dbv.pszVal); } else { - mir_snprintf(UIN, 256, " < %s:%d>", szProto, dbv.dVal); + mir_snprintf(UIN, 256, "<%s:%d>", szProto, dbv.dVal); } varstring = MakeVariablesString(g_CluiData.varFilter, UIN); ZeroMemory(&fi, sizeof(fi)); diff --git a/plugins/Clist_modern/resource.rc b/plugins/Clist_modern/resource.rc index 790256e5d9..9bdb0e174e 100644 --- a/plugins/Clist_modern/resource.rc +++ b/plugins/Clist_modern/resource.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include < winresrc.h> +#include #include "hdr/modern_statusmodes.h" ///////////////////////////////////////////////////////////////////////////// @@ -1218,7 +1218,7 @@ END 2 TEXTINCLUDE BEGIN - "#include < winresrc.h>\r\n" + "#include \r\n" "#include ""hdr/modern_statusmodes.h""\r\n" "\0" END diff --git a/plugins/Clist_modern/version.rc b/plugins/Clist_modern/version.rc index e41c4fcb99..cd673b369d 100644 --- a/plugins/Clist_modern/version.rc +++ b/plugins/Clist_modern/version.rc @@ -1,5 +1,5 @@ -#include < winresrc.h> +#include #include "version.h" VS_VERSION_INFO VERSIONINFO -- cgit v1.2.3