1 files changed, 48 insertions, 48 deletions

diff --git a/kfax/options.cpp b/kfax/options.cpp
index 756eac62..150314ba 100644
--- a/kfax/options.cpp
+++ b/kfax/options.cpp
@@ -57,7 +57,7 @@ OptionsDialog::OptionsDialog( TQWidget *parent, const char *name)
   TQVBoxLayout *mainLayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
   bg = new TQGroupBox(mainWidget,"bg");
-  bg->setColumnLayout( 0, Qt::Horizontal );
+  bg->setColumnLayout( 0, TQt::Horizontal );
   mainLayout->addWidget( bg );
 
   TQVBoxLayout *vbl = new TQVBoxLayout(bg->layout());
@@ -143,17 +143,17 @@ OptionsDialog::OptionsDialog( TQWidget *parent, const char *name)
   hbl4->addWidget( rawlabel );
 
   g3 = new TQRadioButton("G3",rawgroup,"g3");
-  connect(g3,TQT_SIGNAL(clicked()), this, TQT_SLOT(g3toggled()));
+  connect(g3,TQ_SIGNAL(clicked()), this, TQ_SLOT(g3toggled()));
   hbl4->addSpacing( 20 );
   hbl4->addWidget( g3 );
 
   g32d = new TQRadioButton("G32d",rawgroup,"g32d");
-  connect(g32d,TQT_SIGNAL(clicked()), this,TQT_SLOT(g32toggled()));
+  connect(g32d,TQ_SIGNAL(clicked()), this,TQ_SLOT(g32toggled()));
   hbl4->addSpacing( 30 );
   hbl4->addWidget( g32d );
 
   g4 = new TQRadioButton("G4",rawgroup,"g4");
-  connect(g4,TQT_SIGNAL(clicked()), this, TQT_SLOT(g4toggled()));
+  connect(g4,TQ_SIGNAL(clicked()), this, TQ_SLOT(g4toggled()));
   hbl4->addSpacing( 30 );
   hbl4->addWidget( g4 );
 
@@ -179,7 +179,7 @@ OptionsDialog::OptionsDialog( TQWidget *parent, const char *name)
   hbl5->addWidget( heightedit );
 
   geomauto = new TQCheckBox(i18n("Auto"),bg,"geomauto");
-  connect(geomauto,TQT_SIGNAL(clicked()),this,TQT_SLOT(geomtoggled()));
+  connect(geomauto,TQ_SIGNAL(clicked()),this,TQ_SLOT(geomtoggled()));
   hbl5->addSpacing( 10 );
   hbl5->addWidget( geomauto );
 }
@@ -255,64 +255,64 @@ void OptionsDialog::setWidgets(struct optionsinfo* newoi ){
   }
   else{
     if(newoi->fine == 1){
-      resauto->setChecked(FALSE);
-      fine->setChecked(TRUE);
-      normal->setChecked(FALSE);
+      resauto->setChecked(false);
+      fine->setChecked(true);
+      normal->setChecked(false);
     }
     else{
-      resauto->setChecked(FALSE);
-      fine->setChecked(FALSE);
-      normal->setChecked(TRUE);
+      resauto->setChecked(false);
+      fine->setChecked(false);
+      normal->setChecked(true);
     }
   }
 
   if(newoi->landscape == 1)
-    landscape->setChecked(TRUE);
+    landscape->setChecked(true);
   else
-    landscape->setChecked(FALSE);
+    landscape->setChecked(false);
 
   if(newoi->flip == 1)
-    flip->setChecked(TRUE);
+    flip->setChecked(true);
   else
-    flip->setChecked(FALSE);
+    flip->setChecked(false);
 
   if(newoi->invert == 1)
-    invert->setChecked(TRUE);
+    invert->setChecked(true);
   else
-    invert->setChecked(FALSE);
+    invert->setChecked(false);
 
   if(newoi->lsbfirst == 1)
-    lsb->setChecked(TRUE);
+    lsb->setChecked(true);
   else
-    lsb->setChecked(FALSE);
+    lsb->setChecked(false);
 
   if(newoi->raw == 3){
-    geomauto->setEnabled(TRUE);
-    g3->setChecked(TRUE);
+    geomauto->setEnabled(true);
+    g3->setChecked(true);
   }
 
   if(newoi->raw == 2){
-    geomauto->setEnabled(FALSE);
-    g32d->setChecked(TRUE);
+    geomauto->setEnabled(false);
+    g32d->setChecked(true);
   }
 
   if(newoi->raw == 4){
-    geomauto->setEnabled(FALSE);
-    g4->setChecked(TRUE);
+    geomauto->setEnabled(false);
+    g4->setChecked(true);
   }
   widthedit->setValue(newoi->width);
   heightedit->setValue(newoi->height);
 
   // auto height and width can only work with g3 faxes
   if(newoi->geomauto == 1 && newoi->raw != 4 && newoi->raw != 2){
-    geomauto->setChecked(TRUE);
-    widthedit->setEnabled(FALSE);
-    heightedit->setEnabled(FALSE);
+    geomauto->setChecked(true);
+    widthedit->setEnabled(false);
+    heightedit->setEnabled(false);
   }
   else{
-    geomauto->setChecked(FALSE);
-    widthedit->setEnabled(TRUE);
-    heightedit->setEnabled(TRUE);
+    geomauto->setChecked(false);
+    widthedit->setEnabled(true);
+    heightedit->setEnabled(true);
 
   }
 
@@ -321,19 +321,19 @@ void OptionsDialog::setWidgets(struct optionsinfo* newoi ){
 
 void OptionsDialog::g32toggled(){
 
-  geomauto->setChecked(FALSE);
-  geomauto->setEnabled(FALSE);
-  widthedit->setEnabled(TRUE);
-  heightedit->setEnabled(TRUE);
+  geomauto->setChecked(false);
+  geomauto->setEnabled(false);
+  widthedit->setEnabled(true);
+  heightedit->setEnabled(true);
 
 }
 
 void OptionsDialog::g4toggled(){
 
-  geomauto->setChecked(FALSE);
-  geomauto->setEnabled(FALSE);
-  widthedit->setEnabled(TRUE);
-  heightedit->setEnabled(TRUE);
+  geomauto->setChecked(false);
+  geomauto->setEnabled(false);
+  widthedit->setEnabled(true);
+  heightedit->setEnabled(true);
 
 
 }
@@ -341,10 +341,10 @@ void OptionsDialog::g4toggled(){
 
 void OptionsDialog::g3toggled(){
 
-  geomauto->setEnabled(TRUE);
-  geomauto->setChecked(TRUE);
-  widthedit->setEnabled(FALSE);
-  heightedit->setEnabled(FALSE);
+  geomauto->setEnabled(true);
+  geomauto->setChecked(true);
+  widthedit->setEnabled(false);
+  heightedit->setEnabled(false);
 
 
 }
@@ -353,21 +353,21 @@ void OptionsDialog::geomtoggled(){
 
   if(geomauto->isChecked()){
 
-    widthedit->setEnabled(FALSE);
-    heightedit->setEnabled(FALSE);
+    widthedit->setEnabled(false);
+    heightedit->setEnabled(false);
 
   }
   else{
 
-    widthedit->setEnabled(TRUE);
-    heightedit->setEnabled(TRUE);
+    widthedit->setEnabled(true);
+    heightedit->setEnabled(true);
 
   }
 
 }
 
 void OptionsDialog::slotHelp(){
-  kapp->invokeHelp();
+  tdeApp->invokeHelp();
 }