TQt4 port kdeedu

This enables compilation under both Qt3 and Qt4


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

1 files changed, 9 insertions, 9 deletions

diff --git a/ktouch/src/ktouchkeyboardeditor.cpp b/ktouch/src/ktouchkeyboardeditor.cpp
index 54f026bb..17c87997 100644
--- a/ktouch/src/ktouchkeyboardeditor.cpp
+++ b/ktouch/src/ktouchkeyboardeditor.cpp
@@ -34,8 +34,8 @@
 // ***** Public functions ***
 // **************************
 
-KTouchKeyboardEditor::KTouchKeyboardEditor(TQWidget* parent, const char* name, bool modal, WFlags fl)
-  : KTouchKeyboardEditorDlg(parent,name, modal,fl)
+KTouchKeyboardEditor::KTouchKeyboardEditor(TQWidget* tqparent, const char* name, bool modal, WFlags fl)
+  : KTouchKeyboardEditorDlg(tqparent,name, modal,fl)
 {
 }
 // -----------------------------------------------------------------------------
@@ -66,7 +66,7 @@ void KTouchKeyboardEditor::fontBtnClicked() {
 		titleEdit->setFont(f);  
 		keyboardCommentEdit->setFont(f);  
 		languageEdit->setFont(f);  
-		update();	// trigger repaint of the keyboard.
+		update();	// trigger tqrepaint of the keyboard.
 		setModified();
     }
 }
@@ -89,7 +89,7 @@ void KTouchKeyboardEditor::saveBtnClicked() {
 // -----------------------------------------------------------------------------
 
 void KTouchKeyboardEditor::saveAsBtnClicked() {
-    TQString tmp = KFileDialog::getSaveFileName(TQString::null, 
+    TQString tmp = KFileDialog::getSaveFileName(TQString(), 
         i18n("*.keyboard.xml|KTouch Keyboard Files (*.keyboard.xml)\n*.*|All Files"), this, i18n("Save Keyboard Layout") );
     if (!tmp.isEmpty()) {
         transfer_from_dialog();
@@ -133,7 +133,7 @@ void KTouchKeyboardEditor::paintEvent(TQPaintEvent *) {
 
 void KTouchKeyboardEditor::transfer_to_dialog() {
 	if (m_currentURL.isEmpty()) {
-		titleEdit->setText( i18n("untitled keyboard layout") );
+		titleEdit->setText( i18n("untitled keyboard tqlayout") );
 		keyboardCommentEdit->setText("");
 	}
 	else {
@@ -167,13 +167,13 @@ void KTouchKeyboardEditor::transfer_to_dialog() {
 		min_y = std::min<unsigned int>(min_y, it->m_y);
 		max_y = std::max<unsigned int>(max_y, it->m_y+it->m_h);
 	}
-	dimensionsLabel->setText( i18n("Keyboard dimensions: %1 x %2").arg(max_x - min_x).arg(max_y - min_y) );
+	dimensionsLabel->setText( i18n("Keyboard dimensions: %1 x %2").tqarg(max_x - min_x).tqarg(max_y - min_y) );
 }
 // -----------------------------------------------------------------------------
     
 void KTouchKeyboardEditor::transfer_from_dialog() {
 	m_keyboard.m_title = titleEdit->text();
-	if (m_keyboard.m_title.isEmpty())  m_keyboard.m_title = i18n("untitled keyboard layout");
+	if (m_keyboard.m_title.isEmpty())  m_keyboard.m_title = i18n("untitled keyboard tqlayout");
 	m_keyboard.m_comment = keyboardCommentEdit->text();
 	m_keyboard.m_language = languageEdit->text();
 }
@@ -201,7 +201,7 @@ int KTouchKeyboardEditor::openKeyboardFile(const KURL& url) {
 		    !m_keyboard.load(this, m_currentURL) && !m_keyboard.loadXML(this, m_currentURL)) 
 		{
             KMessageBox::sorry(this, i18n("Could not open the keyboard file, creating a new one instead!"));
-            m_currentURL = TQString::null; // new keyboards haven't got a URL
+            m_currentURL = TQString(); // new keyboards haven't got a URL
 			m_keyboard.clear();
         }
         // If we have no URL, we create a new keyboard - can happen if either the user
@@ -234,7 +234,7 @@ bool KTouchKeyboardEditor::saveModified() {
     if (!m_modified) return true;
     // ok, ask the user to save the changes
     int result = KMessageBox::questionYesNoCancel(this, 
-        i18n("The keyboard has been changed. Do you want to save the changes?"),TQString::null,KStdGuiItem::save(),KStdGuiItem::discard());
+        i18n("The keyboard has been changed. Do you want to save the changes?"),TQString(),KStdGuiItem::save(),KStdGuiItem::discard());
     if (result == KMessageBox::Cancel) return false; // User aborted
     if (result == KMessageBox::Yes) saveBtnClicked();
     // if successfully saved the modified flag will be resetted in the saveBtnClicked() function