Rename obsolete tq methods to standard names

10 files changed, 25 insertions, 25 deletions

diff --git a/kgpg/conf_encryption.ui b/kgpg/conf_encryption.ui
index 2aabb64..ff807aa 100644
--- a/kgpg/conf_encryption.ui
+++ b/kgpg/conf_encryption.ui
@@ -111,7 +111,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="7" column="0" rowspan="1" colspan="4">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kgpg/conf_gpg.ui b/kgpg/conf_gpg.ui
index 416f242..8a7f14a 100644
--- a/kgpg/conf_gpg.ui
+++ b/kgpg/conf_gpg.ui
@@ -166,7 +166,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <vbox>
                         <property name="name">
diff --git a/kgpg/conf_servers.ui b/kgpg/conf_servers.ui
index a765cd9..f93b871 100644
--- a/kgpg/conf_servers.ui
+++ b/kgpg/conf_servers.ui
@@ -82,7 +82,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="4" column="0">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/kgpg/keyproperties.ui b/kgpg/keyproperties.ui
index b64e9a8..7dce70b 100644
--- a/kgpg/keyproperties.ui
+++ b/kgpg/keyproperties.ui
@@ -32,7 +32,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="3" rowspan="7" colspan="1">
             <property name="name">
-                <cstring>tqlayout39</cstring>
+                <cstring>layout39</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -92,7 +92,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout13</cstring>
+                        <cstring>layout13</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -117,7 +117,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="7" column="3" rowspan="4" colspan="1">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp
index e258db1..7dc8c75 100644
--- a/kgpg/kgpg.cpp
+++ b/kgpg/kgpg.cpp
@@ -121,13 +121,13 @@ void  MyView::clipEncrypt()
 
 void  MyView::clipDecrypt()
 {
-        TQString clippie=kapp->tqclipboard()->text(clipboardMode).stripWhiteSpace();
+        TQString clippie=kapp->clipboard()->text(clipboardMode).stripWhiteSpace();
 	droppedtext(clippie,false);
 }
 
 void  MyView::clipSign(bool openEditor)
 {
-        TQString clippie=kapp->tqclipboard()->text(clipboardMode).stripWhiteSpace();
+        TQString clippie=kapp->clipboard()->text(clipboardMode).stripWhiteSpace();
         if (!clippie.isEmpty()) {
                 KgpgApp *kgpgtxtedit = new KgpgApp(0, "editor",WDestructiveClose,goDefaultKey);
 		connect(this,TQT_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQT_SLOT(slotSetFont(TQFont)));
@@ -302,8 +302,8 @@ void  MyView::shredDroppedFile()
 KDialogBase *shredConfirm=new KDialogBase( this, "confirm_shred", true,i18n("Shred Files"),KDialogBase::Ok | KDialogBase::Cancel);
 TQWidget *page = new TQWidget(shredConfirm);
 shredConfirm->setMainWidget(page);
-TQBoxLayout *tqlayout=new TQBoxLayout(page,TQBoxLayout::TopToBottom,0);
-tqlayout->setAutoAdd(true);
+TQBoxLayout *layout=new TQBoxLayout(page,TQBoxLayout::TopToBottom,0);
+layout->setAutoAdd(true);
 
 (void) new KActiveLabel( i18n("Do you really want to <a href=\"whatsthis:%1\">shred</a> these files?").arg(i18n( "<qt><p>You must be aware that <b>shredding is not secure</b> on all file systems, and that parts of the file may have been saved in a temporary file or in the spooler of your printer if you previously opened it in an editor or tried to print it. Only works on files (not on folders).</p></qt>")),page);
 KListBox *lb=new KListBox(page);
@@ -560,7 +560,7 @@ void  MyView::dropEvent (TQDropEvent *o)
                 droppedfile(list);
         else if ( TQTextDrag::decode(o, text) )
 		{
-	        TQApplication::tqclipboard()->setText(text,clipboardMode);
+	        TQApplication::clipboard()->setText(text,clipboardMode);
                 droppedtext(text);
 		}
 }
@@ -569,7 +569,7 @@ void  MyView::dropEvent (TQDropEvent *o)
 void  MyView::readOptions()
 {
 	clipboardMode=TQClipboard::Clipboard;
-        if ( KGpgSettings::useMouseSelection() && kapp->tqclipboard()->supportsSelection())
+        if ( KGpgSettings::useMouseSelection() && kapp->clipboard()->supportsSelection())
                 clipboardMode=TQClipboard::Selection;
 
 	if (KGpgSettings::firstRun()) {
@@ -804,7 +804,7 @@ kgpgapplet::kgpgapplet(TQWidget *parent, const char *name)
 void kgpgapplet::checkMenu()
 {
 	KgpgDecryptClipboard->setEnabled(false);
-	if ((kapp->tqclipboard()->text(w->clipboardMode).isEmpty()))
+	if ((kapp->clipboard()->text(w->clipboardMode).isEmpty()))
 	{
 		KgpgEncryptClipboard->setEnabled(false);
 		KgpgSignClipboard->setEnabled(false);
@@ -812,7 +812,7 @@ void kgpgapplet::checkMenu()
 	else
 	{
 		KgpgEncryptClipboard->setEnabled(true);
-		if (kapp->tqclipboard()->text(w->clipboardMode).stripWhiteSpace().startsWith("-----BEGIN"))
+		if (kapp->clipboard()->text(w->clipboardMode).stripWhiteSpace().startsWith("-----BEGIN"))
 		KgpgDecryptClipboard->setEnabled(true);
 		KgpgSignClipboard->setEnabled(true);
 	}
@@ -1008,7 +1008,7 @@ int KgpgAppletApp::newInstance()
 
 void MyView::encryptClipboard(TQStringList selec,TQStringList encryptOptions,bool,bool symmetric)
 {
-        if (kapp->tqclipboard()->text(clipboardMode).isEmpty()) {
+        if (kapp->clipboard()->text(clipboardMode).isEmpty()) {
 	KPassivePopup::message(i18n("Clipboard is empty."),TQString(),KGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this);
 	return;
 	}
@@ -1020,12 +1020,12 @@ void MyView::encryptClipboard(TQStringList selec,TQStringList encryptOptions,boo
                 KgpgInterface *txtEncrypt=new KgpgInterface();
                 connect (txtEncrypt,TQT_SIGNAL(txtencryptionfinished(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotSetClip(TQString)));
 		connect (txtEncrypt,TQT_SIGNAL(txtencryptionstarted()),TQT_TQOBJECT(this),TQT_SLOT(slotPassiveClip()));
-                txtEncrypt->KgpgEncryptText(kapp->tqclipboard()->text(clipboardMode),selec,encryptOptions);
+                txtEncrypt->KgpgEncryptText(kapp->clipboard()->text(clipboardMode),selec,encryptOptions);
 }
 
 void MyView::slotPassiveClip()
 {
-TQString newtxt=kapp->tqclipboard()->text(clipboardMode);
+TQString newtxt=kapp->clipboard()->text(clipboardMode);
 if (newtxt.length()>300)
                         newtxt=TQString(newtxt.left(250).stripWhiteSpace())+"...\n"+TQString(newtxt.right(40).stripWhiteSpace());
 
@@ -1045,7 +1045,7 @@ pop = new KPassivePopup( this);
 void MyView::slotSetClip(TQString newtxt)
 {
         if (newtxt.isEmpty()) return;
-                TQApplication::tqclipboard()->setText(newtxt,clipboardMode);//,TQClipboard::Clipboard);    QT 3.1 only
+                TQApplication::clipboard()->setText(newtxt,clipboardMode);//,TQClipboard::Clipboard);    QT 3.1 only
 }
 
 
diff --git a/kgpg/kgpgeditor.cpp b/kgpg/kgpgeditor.cpp
index 5de453a..59acd4e 100644
--- a/kgpg/kgpgeditor.cpp
+++ b/kgpg/kgpgeditor.cpp
@@ -314,7 +314,7 @@ void KgpgApp::slotFileSave()
     TQTextCodec*cod=TQTextCodec::codecForName (textEncoding.ascii());
         // slotStatusMsg(i18n("Saving file..."));
     if (!checkEncoding(cod)) {
-	KMessageBox::sorry(this,i18n("The document could not been saved, as the selected encoding cannot encode every tqunicode character in it."));
+	KMessageBox::sorry(this,i18n("The document could not been saved, as the selected encoding cannot encode every unicode character in it."));
 	return;
     }
 
diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp
index aa65050..7e9dc56 100644
--- a/kgpg/kgpginterface.cpp
+++ b/kgpg/kgpginterface.cpp
@@ -664,7 +664,7 @@ Md5Widget::~Md5Widget()
 
 void Md5Widget::slotApply()
 {
-        TQClipboard *cb = TQApplication::tqclipboard();
+        TQClipboard *cb = TQApplication::clipboard();
         TQString text;
         // Copy text from the clipboard (paste)
         text = cb->text(TQClipboard::Clipboard);
diff --git a/kgpg/kgpgview.cpp b/kgpg/kgpgview.cpp
index a8a3cb9..2e6540c 100644
--- a/kgpg/kgpgview.cpp
+++ b/kgpg/kgpgview.cpp
@@ -195,7 +195,7 @@ KgpgView::KgpgView(TQWidget *parent, const char *name) : TQWidget(parent, name)
         editor=new MyEditor(this);
 	windowAutoClose=true;
 
-        /////    tqlayout
+        /////    layout
 
         TQVBoxLayout *vbox=new TQVBoxLayout(this,3);
 
@@ -214,7 +214,7 @@ KgpgView::KgpgView(TQWidget *parent, const char *name) : TQWidget(parent, name)
 
         TQObject::connect(editor,TQT_SIGNAL(textChanged()),TQT_TQOBJECT(this),TQT_SLOT(modified()));
 
-        boutonbox->tqlayout();
+        boutonbox->layout();
         editor->resize(editor->maximumSize());
         vbox->addWidget(editor);
         vbox->addWidget(boutonbox);
diff --git a/kgpg/kgpgwizard.ui b/kgpg/kgpgwizard.ui
index 7a6b774..c607b30 100644
--- a/kgpg/kgpgwizard.ui
+++ b/kgpg/kgpgwizard.ui
@@ -313,7 +313,7 @@ Remember that if you download a file or open one in an editor, parts of the file
             </spacer>
             <widget class="TQLayoutWidget" row="1" column="1">
                 <property name="name">
-                    <cstring>tqlayout2</cstring>
+                    <cstring>layout2</cstring>
                 </property>
                 <hbox>
                     <property name="name">
diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp
index fa2120d..f09d6ac 100644
--- a/kgpg/listkeys.cpp
+++ b/kgpg/listkeys.cpp
@@ -1593,7 +1593,7 @@ void listKeys::slotProcessExportMail(TQString keys)
 
 void listKeys::slotProcessExportClip(TQString keys)
 {
-        kapp->tqclipboard()->setText(keys,clipboardMode);
+        kapp->clipboard()->setText(keys,clipboardMode);
 }
 
 
@@ -2488,7 +2488,7 @@ void listKeys::slotPreImportKey()
                                 connect(importKeyProcess,TQT_SIGNAL(refreshOrphaned()),keysList2,TQT_SLOT(slotReloadOrphaned()));
                         }
                 } else {
-                        TQString keystr = kapp->tqclipboard()->text(clipboardMode);
+                        TQString keystr = kapp->clipboard()->text(clipboardMode);
                         if (!keystr.isEmpty()) {
                                 changeMessage(i18n("Importing..."),0,true);
                                 KgpgInterface *importKeyProcess=new KgpgInterface();