7 files changed, 13 insertions, 13 deletions
diff --git a/katapult/common/CMakeLists.txt b/katapult/common/CMakeLists.txt
index 714a983..3df88b5 100644
--- a/katapult/common/CMakeLists.txt
+++ b/katapult/common/CMakeLists.txt
@@ -40,11 +40,11 @@ tde_add_library( ${PROJECT_NAME} SHARED AUTOMOC
 tde_create_translated_desktop(
     SOURCE katapultcatalog.desktop
     DESTINATION ${SERVICETYPES_INSTALL_DIR}
-    PO_DIR ${CMAKE_SOURCE_DIR}/translations/desktop_files/katapult-catalogs
+    PO_DIR katapult-catalogs
 )
 
 tde_create_translated_desktop(
     SOURCE katapultdisplay.desktop
     DESTINATION ${SERVICETYPES_INSTALL_DIR}
-    PO_DIR ${CMAKE_SOURCE_DIR}/translations/desktop_files/katapult-displays
+    PO_DIR katapult-displays
 )
diff --git a/katapult/common/cachedcatalog.h b/katapult/common/cachedcatalog.h
index 291b0d3..c7a0348 100644
--- a/katapult/common/cachedcatalog.h
+++ b/katapult/common/cachedcatalog.h
@@ -32,7 +32,7 @@ class KatapultItem;
 */
 class KDE_EXPORT CachedCatalog : public KatapultCatalog
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	CachedCatalog();
diff --git a/katapult/common/imagedisplay.cpp b/katapult/common/imagedisplay.cpp
index 3aaf7e2..9350960 100644
--- a/katapult/common/imagedisplay.cpp
+++ b/katapult/common/imagedisplay.cpp
@@ -51,7 +51,7 @@ ImageDisplay::ImageDisplay(TQObject *, const char *name, const TQStringList&)
 {
 	KWin::setType(winId(), NET::Dock);
 	setBackgroundMode(NoBackground);
-	setFocusPolicy(TQ_StrongFocus);
+	setFocusPolicy(TQWidget::StrongFocus);
 	
         singlebg = 0;
         doublebg = 0;
@@ -74,7 +74,7 @@ ImageDisplay::ImageDisplay(TQObject *, const char *name, const TQStringList&)
 	
 	alpha = 0;
 	fadeTimer = new TQTimer(this);
-	connect(fadeTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(continueFade()));
+	connect(fadeTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(continueFade()));
 	
 	desktopSize = tqApp->desktop()->availableGeometry(TQCursor::pos());
 	
@@ -408,16 +408,16 @@ TQWidget * ImageDisplay::configure()
 	ImageDisplaySettings *settings = new ImageDisplaySettings();
 	
 	settings->fadeTime->setValue(fadeTime);
-	connect(settings->fadeTime, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setFadeOut(int)));
+	connect(settings->fadeTime, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setFadeOut(int)));
 	
 	settings->displayFont->setCurrentFont(fontFace);
-	connect(settings->displayFont, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(setFont(const TQString &)));
+	connect(settings->displayFont, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(setFont(const TQString &)));
 	
 	settings->minFontSize->setValue(minFontSize);
-	connect(settings->minFontSize, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setMinFontSize(int)));
+	connect(settings->minFontSize, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setMinFontSize(int)));
 	
 	settings->maxFontSize->setValue(maxFontSize);
-	connect(settings->maxFontSize, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setMaxFontSize(int)));
+	connect(settings->maxFontSize, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setMaxFontSize(int)));
 	
 	return settings;
 }
diff --git a/katapult/common/imagedisplay.h b/katapult/common/imagedisplay.h
index aa99895..c24c86b 100644
--- a/katapult/common/imagedisplay.h
+++ b/katapult/common/imagedisplay.h
@@ -35,7 +35,7 @@ class TQFont;
 */
 class KDE_EXPORT ImageDisplay : public KatapultDisplay
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	ImageDisplay(TQObject *, const char *, const TQStringList&);
diff --git a/katapult/common/katapultcatalog.h b/katapult/common/katapultcatalog.h
index 2f717d3..a066005 100644
--- a/katapult/common/katapultcatalog.h
+++ b/katapult/common/katapultcatalog.h
@@ -33,7 +33,7 @@ class TDEConfigBase;
 @author Joe Ferris
 */
 class KDE_EXPORT KatapultCatalog : public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/katapult/common/katapultdisplay.h b/katapult/common/katapultdisplay.h
index 320f393..5f9a868 100644
--- a/katapult/common/katapultdisplay.h
+++ b/katapult/common/katapultdisplay.h
@@ -35,7 +35,7 @@ class TDEConfigBase;
 */
 class KDE_EXPORT KatapultDisplay : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/katapult/common/katapultitem.h b/katapult/common/katapultitem.h
index 1720d6c..db1550e 100644
--- a/katapult/common/katapultitem.h
+++ b/katapult/common/katapultitem.h
@@ -31,7 +31,7 @@ class TQString;
 @author Joe Ferris
 */
 class KDE_EXPORT KatapultItem : public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
   
 public: