rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/libraries/libkdcraw@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

10 files changed, 27 insertions, 27 deletions

diff --git a/libkdcraw/dcraw/dcraw.c b/libkdcraw/dcraw/dcraw.c
index 3d3addb..da4ec46 100644
--- a/libkdcraw/dcraw/dcraw.c
+++ b/libkdcraw/dcraw/dcraw.c
@@ -1597,12 +1597,12 @@ void CLASS phase_one_correct()
 void CLASS phase_one_load_raw()
 {
   int row, col, a, b;
-  ushort *pixel, akey, bkey, tqmask;
+  ushort *pixel, akey, bkey, mask;
 
   fseek (ifp, ph1.key_off, SEEK_SET);
   akey = get2();
   bkey = get2();
-  tqmask = ph1.format == 1 ? 0x5555:0x1354;
+  mask = ph1.format == 1 ? 0x5555:0x1354;
   fseek (ifp, data_offset + top_margin*raw_width*2, SEEK_SET);
   pixel = (ushort *) calloc (raw_width, sizeof *pixel);
   merror (pixel, "phase_one_load_raw()");
@@ -1611,8 +1611,8 @@ void CLASS phase_one_load_raw()
     for (col=0; col < raw_width; col+=2) {
       a = pixel[col+0] ^ akey;
       b = pixel[col+1] ^ bkey;
-      pixel[col+0] = (a & tqmask) | (b & ~tqmask);
-      pixel[col+1] = (b & tqmask) | (a & ~tqmask);
+      pixel[col+0] = (a & mask) | (b & ~mask);
+      pixel[col+1] = (b & mask) | (a & ~mask);
     }
     for (col=0; col < width; col++)
       BAYER(row,col) = pixel[col+left_margin];
diff --git a/libkdcraw/libkdcraw/dcrawsettingswidget.cpp b/libkdcraw/libkdcraw/dcrawsettingswidget.cpp
index b1a4a70..5d288c0 100644
--- a/libkdcraw/libkdcraw/dcrawsettingswidget.cpp
+++ b/libkdcraw/libkdcraw/dcrawsettingswidget.cpp
@@ -147,16 +147,16 @@ public:
     RDoubleNumInput *brightnessSpinBox;
 };
 
-DcrawSettingsWidget::DcrawSettingsWidget(TQWidget *tqparent, int advSettings)
-                   : TQToolBox(tqparent)
+DcrawSettingsWidget::DcrawSettingsWidget(TQWidget *parent, int advSettings)
+                   : TQToolBox(parent)
 {
     setup(advSettings);
 }
 
-DcrawSettingsWidget::DcrawSettingsWidget(TQWidget *tqparent, bool sixteenBitsOption, 
+DcrawSettingsWidget::DcrawSettingsWidget(TQWidget *parent, bool sixteenBitsOption, 
                                          bool outputColorSpaceOption, 
                                          bool postProcessingOptions)
-                   : TQToolBox(tqparent)
+                   : TQToolBox(parent)
 {
     int advSettings = 0;
 
diff --git a/libkdcraw/libkdcraw/dcrawsettingswidget.h b/libkdcraw/libkdcraw/dcrawsettingswidget.h
index 76d84be..6af754c 100644
--- a/libkdcraw/libkdcraw/dcrawsettingswidget.h
+++ b/libkdcraw/libkdcraw/dcrawsettingswidget.h
@@ -72,8 +72,8 @@ public:
     /**
      * @param advSettings the default value is COLORSPACE
      */
-    DcrawSettingsWidget(TQWidget *tqparent, int advSettings);
-    DcrawSettingsWidget(TQWidget *tqparent,
+    DcrawSettingsWidget(TQWidget *parent, int advSettings);
+    DcrawSettingsWidget(TQWidget *parent,
                         bool sixteenBitsOption=false,
                         bool outputColorSpaceOption=true,
                         bool postProcessingOptions=false);
diff --git a/libkdcraw/libkdcraw/rcombobox.cpp b/libkdcraw/libkdcraw/rcombobox.cpp
index ff3b7af..cb9d037 100644
--- a/libkdcraw/libkdcraw/rcombobox.cpp
+++ b/libkdcraw/libkdcraw/rcombobox.cpp
@@ -60,8 +60,8 @@ public:
     KComboBox   *combo;
 };
 
-RComboBox::RComboBox(TQWidget *tqparent)
-         : TQHBox(tqparent)
+RComboBox::RComboBox(TQWidget *parent)
+         : TQHBox(parent)
 {
     d = new RComboBoxPriv;
 
diff --git a/libkdcraw/libkdcraw/rcombobox.h b/libkdcraw/libkdcraw/rcombobox.h
index f23885d..be58727 100644
--- a/libkdcraw/libkdcraw/rcombobox.h
+++ b/libkdcraw/libkdcraw/rcombobox.h
@@ -50,7 +50,7 @@ Q_OBJECT
 
 public:
 
-    RComboBox(TQWidget *tqparent=0);
+    RComboBox(TQWidget *parent=0);
     ~RComboBox();
 
     void setCurrentItem(int d);
diff --git a/libkdcraw/libkdcraw/rnuminput.cpp b/libkdcraw/libkdcraw/rnuminput.cpp
index 1123c4f..e9426bd 100644
--- a/libkdcraw/libkdcraw/rnuminput.cpp
+++ b/libkdcraw/libkdcraw/rnuminput.cpp
@@ -61,8 +61,8 @@ public:
     KIntNumInput *input;
 };
 
-RIntNumInput::RIntNumInput(TQWidget *tqparent)
-            : TQHBox(tqparent)
+RIntNumInput::RIntNumInput(TQWidget *parent)
+            : TQHBox(parent)
 {
     d = new RIntNumInputPriv;
 
@@ -159,8 +159,8 @@ public:
     KDoubleNumInput *input;
 };
 
-RDoubleNumInput::RDoubleNumInput(TQWidget *tqparent)
-               : TQHBox(tqparent)
+RDoubleNumInput::RDoubleNumInput(TQWidget *parent)
+               : TQHBox(parent)
 {
     d = new RDoubleNumInputPriv;
 
diff --git a/libkdcraw/libkdcraw/rnuminput.h b/libkdcraw/libkdcraw/rnuminput.h
index 14bc03a..a3c0560 100644
--- a/libkdcraw/libkdcraw/rnuminput.h
+++ b/libkdcraw/libkdcraw/rnuminput.h
@@ -51,7 +51,7 @@ Q_OBJECT
 
 public:
 
-    RIntNumInput(TQWidget *tqparent=0);
+    RIntNumInput(TQWidget *parent=0);
     ~RIntNumInput();
 
     int  value();
@@ -94,7 +94,7 @@ Q_OBJECT
 
 public:
 
-    RDoubleNumInput(TQWidget *tqparent=0);
+    RDoubleNumInput(TQWidget *parent=0);
     ~RDoubleNumInput();
 
     double value();
diff --git a/libkdcraw/libraw/internal/dcraw_common.cpp b/libkdcraw/libraw/internal/dcraw_common.cpp
index 252b43d..a246a6f 100644
--- a/libkdcraw/libraw/internal/dcraw_common.cpp
+++ b/libkdcraw/libraw/internal/dcraw_common.cpp
@@ -1517,12 +1517,12 @@ void CLASS phase_one_correct()
 void CLASS phase_one_load_raw()
 {
   int row, col, a, b;
-  ushort *pixel, akey, bkey, tqmask;
+  ushort *pixel, akey, bkey, mask;
 
   fseek (ifp, ph1.key_off, SEEK_SET);
   akey = get2();
   bkey = get2();
-  tqmask = ph1.format == 1 ? 0x5555:0x1354;
+  mask = ph1.format == 1 ? 0x5555:0x1354;
 #ifndef LIBRAW_LIBRARY_BUILD
   fseek (ifp, data_offset + top_margin*raw_width*2, SEEK_SET);
   pixel = (ushort *) calloc (raw_width, sizeof *pixel);
@@ -1532,8 +1532,8 @@ void CLASS phase_one_load_raw()
     for (col=0; col < raw_width; col+=2) {
       a = pixel[col+0] ^ akey;
       b = pixel[col+1] ^ bkey;
-      pixel[col+0] = (a & tqmask) | (b & ~tqmask);
-      pixel[col+1] = (b & tqmask) | (a & ~tqmask);
+      pixel[col+0] = (a & mask) | (b & ~mask);
+      pixel[col+1] = (b & mask) | (a & ~mask);
     }
     for (col=0; col < width; col++)
       BAYER(row,col) = pixel[col+left_margin];
@@ -1548,8 +1548,8 @@ void CLASS phase_one_load_raw()
     for (col=0; col < raw_width; col+=2) {
       a = pixel[col+0] ^ akey;
       b = pixel[col+1] ^ bkey;
-      pixel[col+0] = (a & tqmask) | (b & ~tqmask);
-      pixel[col+1] = (b & tqmask) | (a & ~tqmask);
+      pixel[col+0] = (a & mask) | (b & ~mask);
+      pixel[col+1] = (b & mask) | (a & ~mask);
     }
     for (col=0; col < raw_width; col++)
         {
diff --git a/libkdcraw/libraw/libraw/libraw_types.h b/libkdcraw/libraw/libraw/libraw_types.h
index a39fceb..188b651 100644
--- a/libkdcraw/libraw/libraw/libraw_types.h
+++ b/libkdcraw/libraw/libraw/libraw_types.h
@@ -119,7 +119,7 @@ typedef struct
     unsigned    is_foveon;
     int         colors;
 
-    unsigned    filters; // camera CFA pattern tqmask
+    unsigned    filters; // camera CFA pattern mask
     char        cdesc[5];
 
 }libraw_iparams_t;
diff --git a/libkdcraw/libraw/samples/unprocessed_raw.cpp b/libkdcraw/libraw/samples/unprocessed_raw.cpp
index 5599509..ca3118d 100644
--- a/libkdcraw/libraw/samples/unprocessed_raw.cpp
+++ b/libkdcraw/libraw/samples/unprocessed_raw.cpp
@@ -118,7 +118,7 @@ int main(int ac, char *av[])
 
             if( (ret = RawProcessor.add_masked_borders_to_bitmap() ) != LIBRAW_SUCCESS)
                 {
-                    fprintf(stderr,"Cannot add tqmask data to bitmap %s\n",av[i]);
+                    fprintf(stderr,"Cannot add mask data to bitmap %s\n",av[i]);
                 }
             for(int r=0;r<S.iheight;r++)
                 for(c=0;c<S.iwidth;c++)