Rename obsolete tq methods to standard names

(cherry picked from commit ba2a3ce341c0c71bbbcf350fcbcd60c552220b31)

3 files changed, 10 insertions, 10 deletions

diff --git a/libkcal/calselectdialog.cpp b/libkcal/calselectdialog.cpp
index 3022d7cc..9c346f48 100644
--- a/libkcal/calselectdialog.cpp
+++ b/libkcal/calselectdialog.cpp
@@ -54,16 +54,16 @@ CalSelectDialog::CalSelectDialog( const TQString &caption, const TQString &label
   : KDialogBase( 0, 0, true, caption, Ok|Cancel, Ok, true )
 {
   TQFrame *frame = makeMainWidget();
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( frame, 0, spacingHint() );
+  TQVBoxLayout *layout = new TQVBoxLayout( frame, 0, spacingHint() );
 
   TQLabel *labelWidget = new TQLabel( label, frame );
-  tqlayout->addWidget( labelWidget );
+  layout->addWidget( labelWidget );
 
   mListBox = new KListBox( frame );
   mListBox->insertStringList( list );
   mListBox->setSelected( 0, true );
   mListBox->ensureCurrentVisible();
-  tqlayout->addWidget( mListBox, 10 );
+  layout->addWidget( mListBox, 10 );
 
   connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem *)),
            TQT_SLOT(slotOk()) );
@@ -72,7 +72,7 @@ CalSelectDialog::CalSelectDialog( const TQString &caption, const TQString &label
 
   mListBox->setFocus();
 
-  tqlayout->addStretch();
+  layout->addStretch();
 
   setMinimumWidth( 320 );
 }
diff --git a/libkcal/dndfactory.cpp b/libkcal/dndfactory.cpp
index 086323b0..61818b9d 100644
--- a/libkcal/dndfactory.cpp
+++ b/libkcal/dndfactory.cpp
@@ -178,7 +178,7 @@ bool DndFactory::cutIncidences( const Incidence::List &incidences )
 
 bool DndFactory::copyIncidences( const Incidence::List &incidences )
 {
-  TQClipboard *cb = TQApplication::tqclipboard();
+  TQClipboard *cb = TQApplication::clipboard();
   CalendarLocal cal( mCalendar->timeZoneId() );
   Incidence::List::ConstIterator it;
 
@@ -206,7 +206,7 @@ bool DndFactory::copyIncidence( Incidence *selectedInc )
 Incidence::List DndFactory::pasteIncidences( const TQDate &newDate, const TQTime *newTime )
 {
   CalendarLocal cal( mCalendar->timeZoneId() );
-  TQClipboard *cb = TQApplication::tqclipboard();
+  TQClipboard *cb = TQApplication::clipboard();
   Incidence::List list;
 
   if ( !ICalDrag::decode( cb->data(), &cal ) &&
@@ -249,7 +249,7 @@ Incidence::List DndFactory::pasteIncidences( const TQDate &newDate, const TQTime
 Incidence *DndFactory::pasteIncidence( const TQDate &newDate, const TQTime *newTime )
 {
   CalendarLocal cal( mCalendar->timeZoneId() );
-  TQClipboard *cb = TQApplication::tqclipboard();
+  TQClipboard *cb = TQApplication::clipboard();
 
   if ( !ICalDrag::decode( cb->data(), &cal ) &&
        !VCalDrag::decode( cb->data(), &cal ) ) {
diff --git a/libkcal/versit/readme.txt b/libkcal/versit/readme.txt
index f5529dd3..5f38fe00 100644
--- a/libkcal/versit/readme.txt
+++ b/libkcal/versit/readme.txt
@@ -391,7 +391,7 @@ c. values of a property is determined by the property definition
 	itself. The vobject APIs does not attempt to enforce
 	any of such definition. It is the consumer responsibility
 	to know what value is expected from a property. e.g
-	most properties have tqunicode string value, so to access
+	most properties have unicode string value, so to access
 	the value of these type of properties, you will use
 	the vObjectUStringZValue() to read the value and
 	setVObjectUStringZValue() to set or modify the value.
@@ -498,7 +498,7 @@ d. properties name (id) are case incensitive.
 
 	const wchar_t* vObjectUStringZValue(VObject *o);
 	    -- retrieve the VObject's value interpreted as
-		null-terminated tqunicode string.
+		null-terminated unicode string.
 
 	unsigned int vObjectIntegerValue(VObject *o);
 	    -- retrieve the VObject's value interpreted as
@@ -578,7 +578,7 @@ d. properties name (id) are case incensitive.
 		-- convert char* to wchar_t*.
 
 	extern int uStrLen(const wchar_t *u);
-		-- length of tqunicode u.
+		-- length of unicode u.
 
 	char *fakeCString(const wchar_t *u);
 		-- convert wchar_t to CString (blindly assumes that