Fix inadvertent "TQ" changes.

2 files changed, 36 insertions, 36 deletions

diff --git a/common/common.h b/common/common.h
index a5fb2fc..a9cafa9 100644
--- a/common/common.h
+++ b/common/common.h
@@ -394,15 +394,15 @@ enum
 
 #define RINGS_INNER_ALPHA(T) qtcRingAlpha[IMG_PLAIN_RINGS==(T) ? 1 : 0] //(IMG_PLAIN_RINGS==opts.bgndImage.type ? 0.25 :  0.125)
 #define RINGS_OUTER_ALPHA    qtcRingAlpha[2] //0.5
-#define RINGS_WIDTH(T)       (IMG_STQUARE_RINGS==T ? 260 : 450)
-#define RINGS_HEIGHT(T)      (IMG_STQUARE_RINGS==T ? 220 : 360)
+#define RINGS_WIDTH(T)       (IMG_SQUARE_RINGS==T ? 260 : 450)
+#define RINGS_HEIGHT(T)      (IMG_SQUARE_RINGS==T ? 220 : 360)
 
-#define RINGS_STQUARE_LARGE_ALPHA (RINGS_OUTER_ALPHA*0.675)
-#define RINGS_STQUARE_SMALL_ALPHA (RINGS_OUTER_ALPHA*0.50)
-#define RINGS_STQUARE_LINE_WIDTH  20.0
-#define RINGS_STQUARE_RADIUS      18.0
-#define RINGS_STQUARE_LARGE_SIZE  120.0
-#define RINGS_STQUARE_SMALL_SIZE  100.0
+#define RINGS_SQUARE_LARGE_ALPHA (RINGS_OUTER_ALPHA*0.675)
+#define RINGS_SQUARE_SMALL_ALPHA (RINGS_OUTER_ALPHA*0.50)
+#define RINGS_SQUARE_LINE_WIDTH  20.0
+#define RINGS_SQUARE_RADIUS      18.0
+#define RINGS_SQUARE_LARGE_SIZE  120.0
+#define RINGS_SQUARE_SMALL_SIZE  100.0
 
 #if !defined __cplusplus
 #define MENU_AND_TOOLTIP_RADIUS   (opts.round>=ROUND_FULL ? 5.0 : 3.5)
@@ -529,7 +529,7 @@ typedef enum
     IMG_NONE,
     IMG_BORDERED_RINGS,
     IMG_PLAIN_RINGS,
-    IMG_STQUARE_RINGS,
+    IMG_SQUARE_RINGS,
     IMG_FILE
 } EImageType;
 
@@ -549,18 +549,18 @@ typedef struct
 
 typedef enum
 {
-    STQUARE_NONE               = 0x0000,
-    STQUARE_ENTRY              = 0x0001,
-    STQUARE_PROGRESS           = 0x0002,
-    STQUARE_SCROLLVIEW         = 0x0004,
-    STQUARE_LISTVIEW_SELECTION = 0x0008,
-    STQUARE_FRAME              = 0x0010,
-    STQUARE_TAB_FRAME          = 0x0020,
-    STQUARE_SLIDER             = 0x0040,
-    STQUARE_SB_SLIDER          = 0x0080,
-    STQUARE_WINDOWS            = 0x0100,
-    STQUARE_TOOLTIPS           = 0x0200,
-    STQUARE_POPUP_MENUS        = 0x0400
+    SQUARE_NONE               = 0x0000,
+    SQUARE_ENTRY              = 0x0001,
+    SQUARE_PROGRESS           = 0x0002,
+    SQUARE_SCROLLVIEW         = 0x0004,
+    SQUARE_LISTVIEW_SELECTION = 0x0008,
+    SQUARE_FRAME              = 0x0010,
+    SQUARE_TAB_FRAME          = 0x0020,
+    SQUARE_SLIDER             = 0x0040,
+    SQUARE_SB_SLIDER          = 0x0080,
+    SQUARE_WINDOWS            = 0x0100,
+    SQUARE_TOOLTIPS           = 0x0200,
+    SQUARE_POPUP_MENUS        = 0x0400
 } ESquare;
 
 typedef enum
@@ -1819,8 +1819,8 @@ ERound getWidgetRound(const Options *opts, int w, int h, EWidget widget)
 {
     ERound r=opts->round;
 
-    if( ((WIDGET_PBAR_TROUGH==widget || WIDGET_PROGRESSBAR==widget) && (opts->square&STQUARE_PROGRESS)) ||
-        (WIDGET_ENTRY==widget && (opts->square&STQUARE_ENTRY)) )
+    if( ((WIDGET_PBAR_TROUGH==widget || WIDGET_PROGRESSBAR==widget) && (opts->square&SQUARE_PROGRESS)) ||
+        (WIDGET_ENTRY==widget && (opts->square&SQUARE_ENTRY)) )
         return ROUND_NONE;
 
     if((WIDGET_CHECKBOX==widget || WIDGET_FOCUS==widget) && ROUND_NONE!=r)
@@ -1870,8 +1870,8 @@ static double getRadius(const Options *opts, int w, int h, EWidget widget, ERadi
     if((WIDGET_CHECKBOX==widget || WIDGET_FOCUS==widget) && ROUND_NONE!=r)
         r=ROUND_SLIGHT;
 
-    if( ((WIDGET_PBAR_TROUGH==widget || WIDGET_PROGRESSBAR==widget) && (opts->square&STQUARE_PROGRESS)) ||
-        (WIDGET_ENTRY==widget && (opts->square&STQUARE_ENTRY)) )
+    if( ((WIDGET_PBAR_TROUGH==widget || WIDGET_PROGRESSBAR==widget) && (opts->square&SQUARE_PROGRESS)) ||
+        (WIDGET_ENTRY==widget && (opts->square&SQUARE_ENTRY)) )
         return 0.0;
 
 #if defined __cplusplus && ( (0x039999 >= 0x040000))
diff --git a/common/config_file.c b/common/config_file.c
index 126838f..77c3feb 100644
--- a/common/config_file.c
+++ b/common/config_file.c
@@ -515,7 +515,7 @@ static EImageType toImageType(const char *str, EImageType def)
         if(0==memcmp(str, "rings", 5))
             return IMG_BORDERED_RINGS;
         if(0==memcmp(str, "squarerings", 11))
-            return IMG_STQUARE_RINGS;
+            return IMG_SQUARE_RINGS;
         if(0==memcmp(str, "file", 4))
             return IMG_FILE;
     }
@@ -1528,7 +1528,7 @@ static void checkConfig(Options *opts)
         opts->coloredTbarMo=true;
 
     if(opts->round<ROUND_SLIGHT)
-        opts->square|=STQUARE_POPUP_MENUS|STQUARE_TOOLTIPS;
+        opts->square|=SQUARE_POPUP_MENUS|SQUARE_TOOLTIPS;
 #endif
 
     if(opts->bgndOpacity<0 || opts->bgndOpacity>100)
@@ -1554,7 +1554,7 @@ static void checkConfig(Options *opts)
     opts->activeTabAppearance=MODIFY_AGUA(opts->activeTabAppearance);
     opts->menuitemAppearance=MODIFY_AGUA(opts->menuitemAppearance);
 
-    if(!opts->borderProgress && (!opts->fillProgress || !(opts->square&STQUARE_PROGRESS)))
+    if(!opts->borderProgress && (!opts->fillProgress || !(opts->square&SQUARE_PROGRESS)))
         opts->borderProgress=true;
 
     opts->titlebarAppearance=MODIFY_AGUA(opts->titlebarAppearance);
@@ -1724,18 +1724,18 @@ static bool readConfig(const char *file, Options *opts, Options *defOpts)
             if(opts->version<MAKE_VERSION(1, 4))
             {
                 opts->square=
-                    (readBoolEntry(cfg, "squareLvSelection", def->square&STQUARE_LISTVIEW_SELECTION) ? STQUARE_LISTVIEW_SELECTION : STQUARE_NONE)+
-                    (readBoolEntry(cfg, "squareScrollViews", def->square&STQUARE_SCROLLVIEW) ? STQUARE_SCROLLVIEW : STQUARE_NONE)+
-                    (readBoolEntry(cfg, "squareProgress", def->square&STQUARE_PROGRESS) ? STQUARE_PROGRESS : STQUARE_NONE)+
-                    (readBoolEntry(cfg, "squareEntry", def->square&STQUARE_ENTRY)? STQUARE_ENTRY : STQUARE_NONE);
+                    (readBoolEntry(cfg, "squareLvSelection", def->square&SQUARE_LISTVIEW_SELECTION) ? SQUARE_LISTVIEW_SELECTION : SQUARE_NONE)+
+                    (readBoolEntry(cfg, "squareScrollViews", def->square&SQUARE_SCROLLVIEW) ? SQUARE_SCROLLVIEW : SQUARE_NONE)+
+                    (readBoolEntry(cfg, "squareProgress", def->square&SQUARE_PROGRESS) ? SQUARE_PROGRESS : SQUARE_NONE)+
+                    (readBoolEntry(cfg, "squareEntry", def->square&SQUARE_ENTRY)? SQUARE_ENTRY : SQUARE_NONE);
             }
             else
                 CFG_READ_INT(square)
 
             if(opts->version<MAKE_VERSION(1, 6))
-                opts->square|=STQUARE_TOOLTIPS;
+                opts->square|=SQUARE_TOOLTIPS;
             if(opts->version<MAKE_VERSION3(1, 6, 1))
-                opts->square|=STQUARE_POPUP_MENUS;
+                opts->square|=SQUARE_POPUP_MENUS;
             if(opts->version<MAKE_VERSION(1, 2))
                 def->crSize=CR_SMALL_SIZE;
             if(opts->version<MAKE_VERSION(1, 0))
@@ -2459,7 +2459,7 @@ static void defaultSettings(Options *opts)
     opts->boldProgress=true;
     opts->coloredTbarMo=false;
     opts->borderSelection=false;
-    opts->square=STQUARE_POPUP_MENUS;
+    opts->square=SQUARE_POPUP_MENUS;
     opts->stripedSbar=false;
     opts->windowDrag=WM_DRAG_NONE;
     opts->shadePopupMenu=false;
@@ -2960,7 +2960,7 @@ static const char * toStr(EImageType lv)
             return "plainrings";
         case IMG_BORDERED_RINGS:
             return "rings";
-        case IMG_STQUARE_RINGS:
+        case IMG_SQUARE_RINGS:
             return "squarerings";
         case IMG_FILE:
             return "file";