Rename old tq methods that no longer need a unique name

15 files changed, 55 insertions, 55 deletions

diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp
index 44c1822..a74637f 100644
--- a/klaptopdaemon/acpi.cpp
+++ b/klaptopdaemon/acpi.cpp
@@ -63,7 +63,7 @@ AcpiConfig::AcpiConfig (TQWidget * parent, const char *name)
 
     TQLabel *tmp_label = new TQLabel( i18n("This panel provides information about your system's ACPI implementation "
 					 "and lets you have access to some of the extra features provided by ACPI"), this );
-    tmp_label->tqsetAlignment( TQt::WordBreak );
+    tmp_label->setAlignment( TQt::WordBreak );
     top_layout->addWidget( tmp_label );
 
     tmp_label = new TQLabel( i18n("NOTE: the Linux ACPI implementation is still a 'work in progress'. "
@@ -73,12 +73,12 @@ AcpiConfig::AcpiConfig (TQWidget * parent, const char *name)
 				"You should test these features very gingerly - save all your work, check them "
 				"on and try a suspend/standby/hibernate from the popup menu on the battery icon "
 				"in the panel if it fails to come back successfully uncheck the box again."), this );
-    tmp_label->tqsetAlignment( TQt::WordBreak );
+    tmp_label->setAlignment( TQt::WordBreak );
     top_layout->addWidget( tmp_label );
 
     tmp_label = new TQLabel( i18n("Some changes made on this page may require you to quit the laptop panel "
 				"and start it again to take effect"), this );
-    tmp_label->tqsetAlignment( TQt::WordBreak );
+    tmp_label->setAlignment( TQt::WordBreak );
     top_layout->addWidget( tmp_label );
 
     bool can_enable = laptop_portable::has_acpi(1);	// is helper ready
@@ -132,7 +132,7 @@ AcpiConfig::AcpiConfig (TQWidget * parent, const char *name)
 				"/proc/acpi/sleep writeable by anyone every time your system boots "
 				"or use the button below to make the KDE ACPI helper application "
 				"set-uid root"), this );
-    tmp_label->tqsetAlignment( TQt::WordBreak );
+    tmp_label->setAlignment( TQt::WordBreak );
     top_layout->addWidget( tmp_label );
     ll = new TQHBoxLayout();
     TQPushButton *setupButton = new TQPushButton(i18n("Setup Helper Application"), this);
diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp
index 3869457..3070f7d 100644
--- a/klaptopdaemon/apm.cpp
+++ b/klaptopdaemon/apm.cpp
@@ -63,7 +63,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name)
 
     TQLabel *tmp_label = new TQLabel( i18n("This panel lets you configure your APM system and lets "
 					"you have access to some of the extra features provided by it"), this );
-    tmp_label->tqsetAlignment( TQt::WordBreak );
+    tmp_label->setAlignment( TQt::WordBreak );
     top_layout->addWidget( tmp_label );
     
     tmp_label = new TQLabel( i18n("NOTE: some APM implementations have buggy suspend/standby "
@@ -71,12 +71,12 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name)
 				"all your work, check them on and try a suspend/standby from "
 				"the popup menu on the battery icon in the panel if it fails to come "
 				"back successfully uncheck the box again."), this );
-    tmp_label->tqsetAlignment( TQt::WordBreak );
+    tmp_label->setAlignment( TQt::WordBreak );
     top_layout->addWidget( tmp_label );
 
     tmp_label = new TQLabel( i18n("Some changes made on this page may require you to quit the laptop panel "
 				"and start it again to take effect"), this );
-    tmp_label->tqsetAlignment( TQt::WordBreak );
+    tmp_label->setAlignment( TQt::WordBreak );
     top_layout->addWidget( tmp_label );
 
     bool can_enable = laptop_portable::has_apm(1);	// is helper ready
@@ -101,7 +101,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name)
 				"/proc/apm writeable by anyone every time your system boots "
 				"or use the button below to make the %1 application "
 				"set-uid root").tqarg(apm_name), this );
-    tmp_label->tqsetAlignment( TQt::WordBreak );
+    tmp_label->setAlignment( TQt::WordBreak );
     top_layout->addWidget( tmp_label );
     TQHBoxLayout *ll = new TQHBoxLayout(top_layout);
     TQPushButton *setupButton = new TQPushButton(i18n("Setup Helper Application"), this);
@@ -114,7 +114,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name)
 	tmp_label = new TQLabel( i18n("Your system seems to have 'Software Suspend' installed, this can "
 				"be used to hibernate or 'suspend to disk' your system if you want "
 				"to use this for hibernation check the box below"), this );
-	tmp_label->tqsetAlignment( TQt::WordBreak );
+	tmp_label->setAlignment( TQt::WordBreak );
 	top_layout->addWidget( tmp_label );
      	enableSoftwareSuspendHibernate = new TQCheckBox( i18n("Enable software suspend for hibernate"), this );
     	top_layout->addWidget( enableSoftwareSuspendHibernate );
@@ -126,7 +126,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name)
 				"Suspend utility - KDE provides a utility to do this, if you "
 				"wish to use it you must make it set-uid root, the button "
 				"below will do this for you"), this );
-	tmp_label->tqsetAlignment( TQt::WordBreak );
+	tmp_label->setAlignment( TQt::WordBreak );
 	top_layout->addWidget( tmp_label );
         ll = new TQHBoxLayout(this);
         TQPushButton *setupSSButton = new TQPushButton(i18n("Setup SS Helper Application"), this);
diff --git a/klaptopdaemon/buttons.cpp b/klaptopdaemon/buttons.cpp
index b00fbc4..79d5de6 100644
--- a/klaptopdaemon/buttons.cpp
+++ b/klaptopdaemon/buttons.cpp
@@ -273,7 +273,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name)
 			    	        "or power switch on your laptop is pressed. Some laptops may already "
 					"automatically do things like this, if you cannot disable them in your BIOS "
 					"you probably should not enable anything in this panel."), this);
-      explain->tqsetAlignment( TQt::WordBreak );
+      explain->setAlignment( TQt::WordBreak );
       top_layout->addWidget(explain);
 
       top_layout->addStretch(1);
diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp
index 7c948b7..0232d2b 100644
--- a/klaptopdaemon/daemondock.cpp
+++ b/klaptopdaemon/daemondock.cpp
@@ -202,7 +202,7 @@ laptop_dock::invokeBrightness()
 		brightness_slider->setMinimumHeight(40);
 		brightness_slider->setMinimumWidth(15);
 		connect(brightness_slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(invokeBrightnessSlider(int)));
-		brightness_widget->resize(brightness_widget->tqsizeHint());
+		brightness_widget->resize(brightness_widget->sizeHint());
 	} else {
 		brightness_slider->setValue(255-brightness);
 	}
diff --git a/klaptopdaemon/kpcmciainfo.cpp b/klaptopdaemon/kpcmciainfo.cpp
index 3a9b67a..bb18a53 100644
--- a/klaptopdaemon/kpcmciainfo.cpp
+++ b/klaptopdaemon/kpcmciainfo.cpp
@@ -57,14 +57,14 @@ KPCMCIAInfo::KPCMCIAInfo(KPCMCIA *pcmcia, TQWidget *parent, const char *name)
 
   prepareCards();
 
-  _mainTab->resize(KDialog::tqsizeHint());
-  resize(KDialog::tqsizeHint());
+  _mainTab->resize(KDialog::sizeHint());
+  resize(KDialog::sizeHint());
 
   connect(_pcmcia, TQT_SIGNAL(cardUpdated(int)), this, TQT_SLOT(updateCard(int)));
 
   _sb = new KStatusBar(this);
   _sb->insertItem(i18n("Ready."), 0, 1, true);
-  _sb->resize(KDialog::tqsizeHint());
+  _sb->resize(KDialog::sizeHint());
   _mainGrid->addMultiCellWidget(_sb, 8, 8, 0, 4);
   _mainGrid->setRowStretch(8, 0);
 
@@ -91,7 +91,7 @@ void KPCMCIAInfo::showTab(int num) {
 }
 
 
-void KPCMCIAInfo::slotResettqStatus() {
+void KPCMCIAInfo::slotResetStatus() {
   _sb->changeItem(i18n("Ready."), 0);
 }
 
@@ -99,12 +99,12 @@ void KPCMCIAInfo::slotResettqStatus() {
 void KPCMCIAInfo::statusNotice(const TQString& text, int life) {
    _sb->changeItem(text, 0);
    if (life > 0)
-      TQTimer::singleShot(life, this, TQT_SLOT(slotResettqStatus()));
+      TQTimer::singleShot(life, this, TQT_SLOT(slotResetStatus()));
 }
 
 
 
-void KPCMCIAInfo::slotTabSettqStatus(const TQString& text) {
+void KPCMCIAInfo::slotTabSetStatus(const TQString& text) {
    statusNotice(text);
 }
 
@@ -134,8 +134,8 @@ void KPCMCIAInfo::prepareCards() {
      TQString tabname = i18n("Card Slot %1");
      KPCMCIAInfoPage *tp = new KPCMCIAInfoPage(_pcmcia->getCard(i), _mainTab);
      connect(this, TQT_SIGNAL(updateNow()), tp, TQT_SLOT(update()));
-     connect(tp, TQT_SIGNAL(setStatusBar(const TQString&)), this, TQT_SLOT(slotTabSettqStatus(const TQString&)));
-     tp->resize(_mainTab->tqsizeHint());
+     connect(tp, TQT_SIGNAL(setStatusBar(const TQString&)), this, TQT_SLOT(slotTabSetStatus(const TQString&)));
+     tp->resize(_mainTab->sizeHint());
      _mainTab->addTab(tp, tabname.tqarg(i+1));
      _pages.insert(i, tp);
   }
@@ -233,13 +233,13 @@ void KPCMCIAInfoPage::update() {
    if (_card) {
       TQString tmp;
       _card_name->setText(_card->name());
-      _card_name->resize(_card_name->tqsizeHint());
+      _card_name->resize(_card_name->sizeHint());
       tmp = i18n("Card type: %1 ");
       _card_type->setText(tmp.tqarg(_card->type()));
-      _card_type->resize(_card_type->tqsizeHint());
+      _card_type->resize(_card_type->sizeHint());
       tmp = i18n("Driver: %1");
       _card_driver->setText(tmp.tqarg(_card->driver()));
-      _card_driver->resize(_card_driver->tqsizeHint());
+      _card_driver->resize(_card_driver->sizeHint());
       tmp = i18n("IRQ: %1%2");
       TQString tmp2;
       switch (_card->intType()) {
@@ -258,31 +258,31 @@ void KPCMCIAInfoPage::update() {
       if (_card->irq() <= 0)
          _card_irq->setText(tmp.tqarg(i18n("none")).tqarg(""));
       else _card_irq->setText(tmp.tqarg(_card->irq()).tqarg(tmp2));
-      _card_irq->resize(_card_irq->tqsizeHint());
+      _card_irq->resize(_card_irq->sizeHint());
       tmp = i18n("I/O port(s): %1");
       if (_card->ports().isEmpty())
          _card_io->setText(tmp.tqarg(i18n("none")));
       else _card_io->setText(tmp.tqarg(_card->ports()));
-      _card_io->resize(_card_io->tqsizeHint());
+      _card_io->resize(_card_io->sizeHint());
       tmp = i18n("Bus: %1 bit %2");
       if (_card->busWidth() == 0)
          _card_bus->setText(i18n("Bus: unknown"));
       else _card_bus->setText(tmp.tqarg(_card->busWidth()).tqarg(_card->busWidth() == 16 ? i18n("PC Card") : i18n("Cardbus")));
-      _card_bus->resize(_card_bus->tqsizeHint());
+      _card_bus->resize(_card_bus->sizeHint());
       tmp = i18n("Device: %1");
       _card_dev->setText(tmp.tqarg(_card->device()));
-      _card_dev->resize(_card_dev->tqsizeHint());
+      _card_dev->resize(_card_dev->sizeHint());
       tmp = i18n("Power: +%1V");
       _card_vcc->setText(tmp.tqarg(_card->vcc()/10));
-      _card_vcc->resize(_card_vcc->tqsizeHint());
+      _card_vcc->resize(_card_vcc->sizeHint());
       tmp = i18n("Programming power: +%1V, +%2V");
       _card_vpp->setText(tmp.tqarg(_card->vpp()/10).tqarg(_card->vpp2()/10));
-      _card_vpp->resize(_card_vpp->tqsizeHint());
+      _card_vpp->resize(_card_vpp->sizeHint());
       tmp = i18n("Configuration base: 0x%1");
       if (_card->configBase() == 0)
          _card_cfgbase->setText(i18n("Configuration base: none"));
       else _card_cfgbase->setText(tmp.tqarg(_card->configBase(), -1, 16));
-      _card_cfgbase->resize(_card_cfgbase->tqsizeHint());
+      _card_cfgbase->resize(_card_cfgbase->sizeHint());
 
       if (!(_card->status() & (CARD_STATUS_READY|CARD_STATUS_SUSPEND))) {
          _card_ej_ins->setText(i18n("&Insert"));
diff --git a/klaptopdaemon/kpcmciainfo.h b/klaptopdaemon/kpcmciainfo.h
index 20bc16e..458219b 100644
--- a/klaptopdaemon/kpcmciainfo.h
+++ b/klaptopdaemon/kpcmciainfo.h
@@ -52,8 +52,8 @@ public slots:
   void slotClose();
   void update();
   void updateCard(int num);
-  void slotResettqStatus();
-  void slotTabSettqStatus(const TQString& text);
+  void slotResetStatus();
+  void slotTabSetStatus(const TQString& text);
 
 signals:
   void updateNow();
diff --git a/klaptopdaemon/krichtextlabel.cpp b/klaptopdaemon/krichtextlabel.cpp
index 3d9dfcd..499577b 100644
--- a/klaptopdaemon/krichtextlabel.cpp
+++ b/klaptopdaemon/krichtextlabel.cpp
@@ -41,14 +41,14 @@ static TQString qrichtextify( const TQString& text )
 KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name )
  : TQLabel ( parent, name ) {
   m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
-  tqsetAlignment( TQt::WordBreak );
+  setAlignment( TQt::WordBreak );
   setText(text);
 }
 
 KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name )
  : TQLabel ( parent, name ) {
   m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
-  tqsetAlignment( TQt::WordBreak );
+  setAlignment( TQt::WordBreak );
 }
 
 void KRichTextLabel::setDefaultWidth(int defaultWidth)
@@ -62,7 +62,7 @@ TQSizePolicy KRichTextLabel::sizePolicy() const
   return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false);
 }
 
-TQSize KRichTextLabel::tqminimumSizeHint() const
+TQSize KRichTextLabel::minimumSizeHint() const
 {
   TQString qt_text = qrichtextify( text() );
   int pref_width = 0;
@@ -97,9 +97,9 @@ TQSize KRichTextLabel::tqminimumSizeHint() const
   return TQSize(pref_width, rt.height());
 }
 
-TQSize KRichTextLabel::tqsizeHint() const
+TQSize KRichTextLabel::sizeHint() const
 {
-  return tqminimumSizeHint();
+  return minimumSizeHint();
 }
 
 void KRichTextLabel::setText( const TQString &text ) {
diff --git a/klaptopdaemon/krichtextlabel.h b/klaptopdaemon/krichtextlabel.h
index 53a60ce..9e7cd8a 100644
--- a/klaptopdaemon/krichtextlabel.h
+++ b/klaptopdaemon/krichtextlabel.h
@@ -46,8 +46,8 @@ public:
   int defaultWidth() const { return m_defaultWidth; }
   void setDefaultWidth(int defaultWidth);
 
-  virtual TQSize tqminimumSizeHint() const;
-  virtual TQSize tqsizeHint() const;
+  virtual TQSize minimumSizeHint() const;
+  virtual TQSize sizeHint() const;
   TQSizePolicy sizePolicy() const;
 
 public slots:
diff --git a/klaptopdaemon/laptop_daemon.cpp b/klaptopdaemon/laptop_daemon.cpp
index 36faefa..2f774d0 100644
--- a/klaptopdaemon/laptop_daemon.cpp
+++ b/klaptopdaemon/laptop_daemon.cpp
@@ -102,7 +102,7 @@ laptop_daemon::laptop_daemon(const TQCString& obj): KDEDModule(obj)
 	sony_disp = 0;
         connect(this, TQT_SIGNAL(signal_checkBattery()), TQT_SLOT(checkBatteryNow()));
 
-	//hasAudio = (audioServer.servertqStatus() == 0) ? true : false;
+	//hasAudio = (audioServer.serverStatus() == 0) ? true : false;
 
         // FIXME: make these configurable.  Some system definitely don't
         //        use /var/run/stab
diff --git a/klaptopdaemon/pcmcia.cpp b/klaptopdaemon/pcmcia.cpp
index a2f4ba8..28328be 100644
--- a/klaptopdaemon/pcmcia.cpp
+++ b/klaptopdaemon/pcmcia.cpp
@@ -84,7 +84,7 @@ PcmciaConfig::PcmciaConfig (TQWidget * parent, const char *name)
         TQString s1 = LAPTOP_VERSION;
         TQString s2 = i18n("Version: ")+s1;
         TQLabel* vers = new TQLabel(s2, this);
-        vers->setMinimumSize(vers->tqsizeHint());
+        vers->setMinimumSize(vers->sizeHint());
         v1->addWidget(vers, 0);
 
         top_layout->activate();          
diff --git a/klaptopdaemon/power.cpp b/klaptopdaemon/power.cpp
index fce096e..6c131dc 100644
--- a/klaptopdaemon/power.cpp
+++ b/klaptopdaemon/power.cpp
@@ -305,13 +305,13 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name)
 					"it works as a sort of extreme screen saver. You can configure different "
 					"timeouts and types of behavior depending on whether or not your laptop is "
 					"plugged in to the mains supply."), this );
-      explain->tqsetAlignment( TQt::WordBreak );
+      explain->setAlignment( TQt::WordBreak );
       top_layout->addWidget(explain);
 
       if (can_standby) {
 	TQLabel* explain3 = new TQLabel(i18n("Different laptops may respond to 'standby' in different ways - in many "
 					"it is only a temporary state and may not be useful for you."), this);
-	explain3->tqsetAlignment( TQt::WordBreak );
+	explain3->setAlignment( TQt::WordBreak );
 	top_layout->addWidget(explain3, 0, TQt::AlignLeft);
       }
 
diff --git a/klaptopdaemon/profile.cpp b/klaptopdaemon/profile.cpp
index b16ad1a..4b0d9c5 100644
--- a/klaptopdaemon/profile.cpp
+++ b/klaptopdaemon/profile.cpp
@@ -205,12 +205,12 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name)
     TQLabel *tmp_label = new TQLabel(i18n("This panel allows you to set default values for system attributes "
 					"so that they change when the laptop is plugged in to the wall or "
 					"running on batteries."), this );
-    tmp_label->tqsetAlignment( TQt::WordBreak );
+    tmp_label->setAlignment( TQt::WordBreak );
     top_layout->addWidget( tmp_label );
 
     tmp_label = new TQLabel(i18n("You can also set options for these values that will be set by low battery "
 				"conditions, or system inactivity in the other panels"), this );
-    tmp_label->tqsetAlignment( TQt::WordBreak );
+    tmp_label->setAlignment( TQt::WordBreak );
     top_layout->addWidget( tmp_label );
     top_layout->addStretch(1);
     top_layout->addWidget( new TQLabel( i18n("Version: %1").tqarg(LAPTOP_VERSION), this), 0, TQt::AlignRight );
diff --git a/klaptopdaemon/warning.cpp b/klaptopdaemon/warning.cpp
index 84d8501..7fb7ddc 100644
--- a/klaptopdaemon/warning.cpp
+++ b/klaptopdaemon/warning.cpp
@@ -164,7 +164,7 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name)
 
     if (can_brightness) {
       checkBrightness = new TQCheckBox(i18n("Panel b&rightness"), this);
-      checkBrightness->setMinimumSize(checkBrightness->tqsizeHint());
+      checkBrightness->setMinimumSize(checkBrightness->sizeHint());
       TQToolTip::add( checkBrightness, i18n( "If enabled the back panel brightness will change" ) );
       grid->addWidget(checkBrightness, curRow, 0);
       connect(checkBrightness, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(brightness_changed(bool)));
@@ -240,19 +240,19 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name)
     if (can_standby) {
       checkStandby = new TQRadioButton(i18n("Standb&y"), b);
       TQToolTip::add( checkStandby, i18n( "Move the system into the standby state - a temporary lower power state" ) );
-      checkStandby->setMinimumSize(checkStandby->tqsizeHint());
+      checkStandby->setMinimumSize(checkStandby->sizeHint());
       connect(checkStandby, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
     }
     if (can_suspend) {
       checkSuspend = new TQRadioButton(i18n("&Suspend"), b);
       TQToolTip::add( checkSuspend, i18n( "Move the system into the suspend state - also known as 'save-to-ram'" ) );
-      checkSuspend->setMinimumSize(checkSuspend->tqsizeHint());
+      checkSuspend->setMinimumSize(checkSuspend->sizeHint());
       connect(checkSuspend, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
     }
     if (can_hibernate) {
       checkHibernate = new TQRadioButton(i18n("H&ibernate"), b);
       TQToolTip::add( checkHibernate, i18n( "Move the system into the hibernate state - also known as 'save-to-disk'" ) );
-      checkHibernate->setMinimumSize(checkHibernate->tqsizeHint());
+      checkHibernate->setMinimumSize(checkHibernate->sizeHint());
       connect(checkHibernate, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
     }
     // setup the logout option
@@ -276,7 +276,7 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name)
     } else {
       explain = new TQLabel(i18n("This panel controls how and when you receive warnings that your battery power is about to run out"), this);
     }
-    explain->tqsetAlignment( TQt::WordBreak );
+    explain->setAlignment( TQt::WordBreak );
     grid->addMultiCellWidget(explain, curRow, curRow, 0, 1);
     ++curRow;
 
diff --git a/klaptopdaemon/xautolock.cc b/klaptopdaemon/xautolock.cc
index 25b2242..630b175 100644
--- a/klaptopdaemon/xautolock.cc
+++ b/klaptopdaemon/xautolock.cc
@@ -32,7 +32,7 @@ extern "C" {
 #include <X11/extensions/dpms.h>
 
 #ifndef HAVE_DPMSINFO_PROTO
-tqStatus DPMSInfo ( Display *, CARD16 *, BOOL * );
+Status DPMSInfo ( Display *, CARD16 *, BOOL * );
 #endif
 }
 #endif
diff --git a/klaptopdaemon/xautolock_engine.c b/klaptopdaemon/xautolock_engine.c
index bbce54e..62f968a 100644
--- a/klaptopdaemon/xautolock_engine.c
+++ b/klaptopdaemon/xautolock_engine.c
@@ -224,7 +224,7 @@ evaluateTriggers (Display* d)
   *  when we are finally re-enabled.
   */
 #ifdef VMS
-  if (vmstqStatus == 0)  
+  if (vmsStatus == 0)  
   {
 #else /* VMS */
   if (lockerPid)
@@ -336,7 +336,7 @@ evaluateTriggers (Display* d)
       || now >= lockTrigger)
   {
 #ifdef VMS
-    if (vmstqStatus != 0)
+    if (vmsStatus != 0)
 #else /* VMS */
     if (!lockerPid)
 #endif /* VMS */
@@ -350,9 +350,9 @@ evaluateTriggers (Display* d)
         case 0:
           (void) close (ConnectionNumber (d));
 #ifdef VMS
-          vmstqStatus = 0;
+          vmsStatus = 0;
           lockerPid = lib$spawn ((lockNow ? &nowLockerDescr : &lockerDescr),
-	                         0, 0, &1, 0, 0, &vmstqStatus);
+	                         0, 0, &1, 0, 0, &vmsStatus);
 
 	  if (!(lockerPid & 1)) exit (lockerPid);