Use centralized cmake version

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 3731df3e93)

CMakeL10n.txt

@@ -9,7 +9,11 @@
 #
 #################################################
 
-cmake_minimum_required( VERSION 3.1 )
+
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
 
 
 ##### include our cmake modules #################

CMakeLists.txt

@@ -9,7 +9,12 @@
 #
 #################################################
 
-cmake_minimum_required( VERSION 3.1 )
+
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
+tde_set_project_version( )
 
 
 ##### general package setup #####################
@@ -36,11 +41,6 @@ include( CheckSymbolExists )
 include( TDEMacros )
 
 
-##### set version number ########################
-
-tde_set_project_version( )
-
-
 ##### setup install paths #######################
 
 include( TDESetupPaths )

src/app/historyAction.cpp

@@ -46,8 +46,8 @@ HistoryCollection::HistoryCollection( TDEActionCollection *ac, TQObject *parent,
         , m_f( new HistoryAction( i18n( "Forward" ), "forward",  TDEStdAccel::forward(), ac, "go_forward" ) )
         , m_receiver( 0 )
 {
-    connect( m_b, TQT_SIGNAL(activated()), TQT_SLOT(pop()) );
-    connect( m_f, TQT_SIGNAL(activated()), TQT_SLOT(pop()) );
+    connect( m_b, TQ_SIGNAL(activated()), TQ_SLOT(pop()) );
+    connect( m_f, TQ_SIGNAL(activated()), TQ_SLOT(pop()) );
 }
 
 void

src/app/historyAction.h

@@ -39,7 +39,7 @@ private:
 
 class HistoryCollection : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
   
 
 public:

src/app/mainWindow.cpp

@@ -43,7 +43,7 @@ MainWindow::MainWindow()
        exit( 1 ); //don't use TQApplication::exit() - it causes a crash
     }
 
-    m_part = (Part *)factory->create( TQT_TQOBJECT(this), "part", "KParts::ReadOnlyPart" );
+    m_part = (Part *)factory->create( this, "part", "KParts::ReadOnlyPart" );
 
     setCentralWidget( m_part->widget() );
     setStandardToolBarMenuEnabled( true );
@@ -57,13 +57,13 @@ MainWindow::MainWindow()
         KMessageBox::error( this, i18n("Filelight is not installed properly, consequently its menus and toolbars will appear reduced or even empty") );
     delete buttons;
 
-    connect( m_part, TQT_SIGNAL(started( TDEIO::Job* )), TQT_SLOT(scanStarted()) );
-    connect( m_part, TQT_SIGNAL(completed()), TQT_SLOT(scanCompleted()) );
-    connect( m_part, TQT_SIGNAL(canceled( const TQString& )), TQT_SLOT(scanFailed()) );
+    connect( m_part, TQ_SIGNAL(started( TDEIO::Job* )), TQ_SLOT(scanStarted()) );
+    connect( m_part, TQ_SIGNAL(completed()), TQ_SLOT(scanCompleted()) );
+    connect( m_part, TQ_SIGNAL(canceled( const TQString& )), TQ_SLOT(scanFailed()) );
 
     //TODO test these
-    connect( m_part, TQT_SIGNAL(canceled( const TQString& )), m_histories, TQT_SLOT(stop()) );
-    connect( BrowserExtension::childObject( m_part ), TQT_SIGNAL(openURLNotify()), TQT_SLOT(urlAboutToChange()) );
+    connect( m_part, TQ_SIGNAL(canceled( const TQString& )), m_histories, TQ_SLOT(stop()) );
+    connect( BrowserExtension::childObject( m_part ), TQ_SIGNAL(openURLNotify()), TQ_SLOT(urlAboutToChange()) );
 
     TDEConfig* const config = TDEGlobal::config();
     config->setGroup( "general" );
@@ -82,30 +82,30 @@ MainWindow::setupActions() //singleton function
     m_combo->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
     m_combo->setDuplicatesEnabled( false );
 
-    KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT(slotScanDirectory()), ac, "scan_directory" );
-    KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), ac );
-    KStdAction::up( TQT_TQOBJECT(this), TQT_SLOT(slotUp()), ac );
-    KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configToolbars()), ac);
-    KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configKeys()), ac);
+    KStdAction::open( this, TQ_SLOT(slotScanDirectory()), ac, "scan_directory" );
+    KStdAction::quit( this, TQ_SLOT(close()), ac );
+    KStdAction::up( this, TQ_SLOT(slotUp()), ac );
+    KStdAction::configureToolbars(this, TQ_SLOT(configToolbars()), ac);
+    KStdAction::keyBindings(this, TQ_SLOT(configKeys()), ac);
 
-    new TDEAction( i18n( "Scan &Home Directory" ), "folder_home", CTRL+Key_Home, TQT_TQOBJECT(this), TQT_SLOT(slotScanHomeDirectory()), ac, "scan_home" );
-    new TDEAction( i18n( "Scan &Root Directory" ), "folder_red", 0, TQT_TQOBJECT(this), TQT_SLOT(slotScanRootDirectory()), ac, "scan_root" );
-    new TDEAction( i18n( "Rescan" ), "reload", TDEStdAccel::reload(), TQT_TQOBJECT(m_part), TQT_SLOT(rescan()), ac, "scan_rescan" );
-    new TDEAction( i18n( "Stop" ), "process-stop", TQt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotAbortScan()), ac, "scan_stop" );
-    new TDEAction( i18n( "Clear Location Bar" ), TDEApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, TQT_TQOBJECT(m_combo), TQT_SLOT(clearEdit()), ac, "clear_location" );
-    new TDEAction( i18n( "Go" ), "key_enter", 0, TQT_TQOBJECT(m_combo), TQT_SIGNAL(returnPressed()), ac, "go" );
+    new TDEAction( i18n( "Scan &Home Directory" ), "folder_home", CTRL+Key_Home, this, TQ_SLOT(slotScanHomeDirectory()), ac, "scan_home" );
+    new TDEAction( i18n( "Scan &Root Directory" ), "folder_red", 0, this, TQ_SLOT(slotScanRootDirectory()), ac, "scan_root" );
+    new TDEAction( i18n( "Rescan" ), "reload", TDEStdAccel::reload(), m_part, TQ_SLOT(rescan()), ac, "scan_rescan" );
+    new TDEAction( i18n( "Stop" ), "process-stop", TQt::Key_Escape, this, TQ_SLOT(slotAbortScan()), ac, "scan_stop" );
+    new TDEAction( i18n( "Clear Location Bar" ), TDEApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, m_combo, TQ_SLOT(clearEdit()), ac, "clear_location" );
+    new TDEAction( i18n( "Go" ), "key_enter", 0, m_combo, TQ_SIGNAL(returnPressed()), ac, "go" );
 
     KWidgetAction *combo = new KWidgetAction( m_combo, i18n( "Location Bar" ), 0, 0, 0, ac, "location_bar" );
     m_recentScans = new TDERecentFilesAction( i18n( "&Recent Scans" ), 0, ac, "scan_recent", 8 );
-    m_histories = new HistoryCollection( ac, TQT_TQOBJECT(this), "history_collection" );
+    m_histories = new HistoryCollection( ac, this, "history_collection" );
 
     ac->action( "scan_directory" )->setText( i18n( "&Scan Directory..." ) );
     m_recentScans->loadEntries( TDEGlobal::config() );
     combo->setAutoSized( true ); //FIXME what does this do?
 
-    connect( m_recentScans, TQT_SIGNAL(urlSelected( const KURL& )), TQT_SLOT(slotScanUrl( const KURL& )) );
-    connect( m_combo, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotComboScan()) );
-    connect( m_histories, TQT_SIGNAL(activated( const KURL& )), TQT_SLOT(slotScanUrl( const KURL& )) );
+    connect( m_recentScans, TQ_SIGNAL(urlSelected( const KURL& )), TQ_SLOT(slotScanUrl( const KURL& )) );
+    connect( m_combo, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotComboScan()) );
+    connect( m_histories, TQ_SIGNAL(activated( const KURL& )), TQ_SLOT(slotScanUrl( const KURL& )) );
 }
 
 bool
@@ -266,7 +266,7 @@ void setActionMenuTextOnly( TDEAction *a, TQString const &suffix )
         TQWidget *w = a->container( i );
         int const id = a->itemId( i );
 
-        if (w->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ))
+        if (w->inherits( "TQPopupMenu" ))
             static_cast<TQPopupMenu*>(w)->changeItem( id, menu_text );
 
         else if (w->inherits( "TDEToolBar" )) {

src/app/mainWindow.h

@@ -35,7 +35,7 @@ class Part;
 
 class MainWindow : public KParts::MainWindow
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:

src/part/dialog.ui

@@ -561,11 +561,11 @@
     <tabstop>dontScanRemoteMounts</tabstop>
     <tabstop>dontScanRemovableMedia</tabstop>
 </tabstops>
-<Q_SLOTS>
+<slots>
     <slot>toggleDontScanRemovableMedia(bool)</slot>
     <slot>toggleDontScanRemoteMounts(bool)</slot>
     <slot>toggleScanAcrossMounts(bool)</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <includes>
     <include location="local"  impldecl="in implementation">knuminput.h</include>

src/part/part.cpp

@@ -57,22 +57,22 @@ Part::Part( TQWidget *parentWidget, const char *widgetName, TQObject *parent, co
     m_map = new RadialMap::Widget( widget() );
     m_map->hide();
 
-    KStdAction::zoomIn( TQT_TQOBJECT(m_map), TQT_SLOT(zoomIn()), actionCollection() );
-    KStdAction::zoomOut( TQT_TQOBJECT(m_map), TQT_SLOT(zoomOut()), actionCollection() );
-    KStdAction::preferences( this, TQT_SLOT(configFilelight()), actionCollection(), "configure_filelight" )->setText( i18n( "Configure Filelight..." ) );
+    KStdAction::zoomIn( m_map, TQ_SLOT(zoomIn()), actionCollection() );
+    KStdAction::zoomOut( m_map, TQ_SLOT(zoomOut()), actionCollection() );
+    KStdAction::preferences( this, TQ_SLOT(configFilelight()), actionCollection(), "configure_filelight" )->setText( i18n( "Configure Filelight..." ) );
 
-    connect( m_map, TQT_SIGNAL(created( const Directory* )), TQT_SIGNAL(completed()) );
-    connect( m_map, TQT_SIGNAL(created( const Directory* )), TQT_SLOT(mapChanged( const Directory* )) );
-    connect( m_map, TQT_SIGNAL(activated( const KURL& )), TQT_SLOT(updateURL( const KURL& )) );
+    connect( m_map, TQ_SIGNAL(created( const Directory* )), TQ_SIGNAL(completed()) );
+    connect( m_map, TQ_SIGNAL(created( const Directory* )), TQ_SLOT(mapChanged( const Directory* )) );
+    connect( m_map, TQ_SIGNAL(activated( const KURL& )), TQ_SLOT(updateURL( const KURL& )) );
 
     // TODO make better system
-    connect( m_map, TQT_SIGNAL(giveMeTreeFor( const KURL& )), TQT_SLOT(updateURL( const KURL& )) );
-    connect( m_map, TQT_SIGNAL(giveMeTreeFor( const KURL& )), TQT_SLOT(openURL( const KURL& )) );
+    connect( m_map, TQ_SIGNAL(giveMeTreeFor( const KURL& )), TQ_SLOT(updateURL( const KURL& )) );
+    connect( m_map, TQ_SIGNAL(giveMeTreeFor( const KURL& )), TQ_SLOT(openURL( const KURL& )) );
 
-    connect( m_manager, TQT_SIGNAL(completed( Directory* )), TQT_SLOT(scanCompleted( Directory* )) );
-    connect( m_manager, TQT_SIGNAL(aboutToEmptyCache()), m_map, TQT_SLOT(invalidate()) );
+    connect( m_manager, TQ_SIGNAL(completed( Directory* )), TQ_SLOT(scanCompleted( Directory* )) );
+    connect( m_manager, TQ_SIGNAL(aboutToEmptyCache()), m_map, TQ_SLOT(invalidate()) );
 
-    TQTimer::singleShot( 0, this, TQT_SLOT(postInit()) );
+    TQTimer::singleShot( 0, this, TQ_SLOT(postInit()) );
 }
 
 void
@@ -81,7 +81,7 @@ Part::postInit()
    if( m_url.isEmpty() ) //if url is not empty openURL() has been called immediately after ctor, which happens
    {
       TQWidget *summary = new SummaryWidget( widget(), "summaryWidget" );
-      connect( summary, TQT_SIGNAL(activated( const KURL& )), TQT_SLOT(openURL( const KURL& )) );
+      connect( summary, TQ_SIGNAL(activated( const KURL& )), TQ_SLOT(openURL( const KURL& )) );
       summary->show();
 
       //FIXME KXMLGUI is b0rked, it should allow us to set this
@@ -167,8 +167,8 @@ Part::configFilelight()
 {
     TQWidget *dialog = new SettingsDialog( widget(), "settings_dialog" );
 
-    connect( dialog, TQT_SIGNAL(canvasIsDirty( int )), m_map, TQT_SLOT(refresh( int )) );
-    connect( dialog, TQT_SIGNAL(mapIsInvalid()), m_manager, TQT_SLOT(emptyCache()) );
+    connect( dialog, TQ_SIGNAL(canvasIsDirty( int )), m_map, TQ_SLOT(refresh( int )) );
+    connect( dialog, TQ_SIGNAL(mapIsInvalid()), m_manager, TQ_SLOT(emptyCache()) );
 
     dialog->show(); //deletes itself
 }
@@ -184,8 +184,8 @@ Part::start( const KURL &url )
 {
    if( !m_started ) {
       m_statusbar->addStatusBarItem( new ProgressBox( statusBar(), this ), 0, true );
-      connect( m_map, TQT_SIGNAL(mouseHover( const TQString& )), statusBar(), TQT_SLOT(message( const TQString& )) );
-      connect( m_map, TQT_SIGNAL(created( const Directory* )), statusBar(), TQT_SLOT(clear()) );
+      connect( m_map, TQ_SIGNAL(mouseHover( const TQString& )), statusBar(), TQ_SLOT(message( const TQString& )) );
+      connect( m_map, TQ_SIGNAL(created( const Directory* )), statusBar(), TQ_SLOT(clear()) );
       m_started = true;
    }
 
@@ -230,7 +230,7 @@ Part::scanCompleted( Directory *tree )
       emit setWindowCaption( TQString() );
 
       statusBar()->clear();
-//      TQTimer::singleShot( 2000, statusBar(), TQT_SLOT(clear()) );
+//      TQTimer::singleShot( 2000, statusBar(), TQ_SLOT(clear()) );
 
       m_url = KURL();
    }
@@ -243,7 +243,7 @@ Part::mapChanged( const Directory *tree )
 
    emit setWindowCaption( prettyURL() );
 
-   ProgressBox *progress = static_cast<ProgressBox *>(TQT_TQWIDGET(statusBar()->child( "ProgressBox" )));
+   ProgressBox *progress = static_cast<ProgressBox *>(statusBar()->child( "ProgressBox" ));
 
    if( progress )
       progress->setText( tree->children() );

src/part/part.h

@@ -28,7 +28,7 @@ namespace Filelight
 
    class Part : public KParts::ReadOnlyPart
    {
-      Q_OBJECT
+      TQ_OBJECT
   
 
    public:

src/part/progressBox.cpp

@@ -22,10 +22,10 @@ ProgressBox::ProgressBox( TQWidget *parent, TQObject *part )
    setText( 999999 );
    setMinimumWidth( sizeHint().width() );
 
-   connect( &m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(report()) );
-   connect( part, TQT_SIGNAL(started( TDEIO::Job* )), TQT_SLOT(start()) );
-   connect( part, TQT_SIGNAL(completed()), TQT_SLOT(stop()) );
-   connect( part, TQT_SIGNAL(canceled( const TQString& )), TQT_SLOT(halt()) );
+   connect( &m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(report()) );
+   connect( part, TQ_SIGNAL(started( TDEIO::Job* )), TQ_SLOT(start()) );
+   connect( part, TQ_SIGNAL(completed()), TQ_SLOT(stop()) );
+   connect( part, TQ_SIGNAL(canceled( const TQString& )), TQ_SLOT(halt()) );
 }
 
 void
@@ -53,7 +53,7 @@ ProgressBox::halt()
 {
    // canceled by stop button
    m_timer.stop();
-   TQTimer::singleShot( 2000, this, TQT_SLOT(hide()) );
+   TQTimer::singleShot( 2000, this, TQ_SLOT(hide()) );
 }
 
 void

src/part/progressBox.h

@@ -12,7 +12,7 @@ namespace TDEIO { class Job; }
 
 class ProgressBox : public TQLabel
 {
-Q_OBJECT
+TQ_OBJECT
   
 
 public:

src/part/radialMap/widget.cpp

@@ -28,9 +28,9 @@ RadialMap::Widget::Widget( TQWidget *parent, const char *name )
    const TQBitmap *cursor = KCursor::handCursor().bitmap();
    m_tip = new SegmentTip(cursor ? cursor->height() : 16);
 
-   connect( this, TQT_SIGNAL(created( const Directory* )), TQT_SLOT(sendFakeMouseEvent()) );
-   connect( this, TQT_SIGNAL(created( const Directory* )), TQT_SLOT(update()) );
-   connect( &m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(resizeTimeout()) );
+   connect( this, TQ_SIGNAL(created( const Directory* )), TQ_SLOT(sendFakeMouseEvent()) );
+   connect( this, TQ_SIGNAL(created( const Directory* )), TQ_SLOT(update()) );
+   connect( &m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(resizeTimeout()) );
 }
 
 TQString
@@ -118,7 +118,7 @@ RadialMap::Widget::createFromCache( const Directory *tree )
 void
 RadialMap::Widget::sendFakeMouseEvent() //slot
 {
-   TQMouseEvent me( TQEvent::MouseMove, mapFromGlobal( TQCursor::pos() ), Qt::NoButton, Qt::NoButton );
+   TQMouseEvent me( TQEvent::MouseMove, mapFromGlobal( TQCursor::pos() ), TQt::NoButton, TQt::NoButton );
    TQApplication::sendEvent( this, &me );
 }
 

src/part/radialMap/widget.h

@@ -52,7 +52,7 @@ namespace RadialMap
 
     class Widget : public TQWidget
     {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     public:

src/part/radialMap/widgetEvents.cpp

@@ -156,7 +156,7 @@ RadialMap::Widget::mousePressEvent( TQMouseEvent *e )
       const KURL url   = Widget::url( m_focus->file() );
       const bool isDir = m_focus->file()->isDirectory();
 
-      if( e->button() == Qt::RightButton )
+      if( e->button() == TQt::RightButton )
       {
          TDEPopupMenu popup;
          popup.insertTitle( m_focus->file()->fullPath( m_tree ) );
@@ -213,7 +213,7 @@ RadialMap::Widget::mousePressEvent( TQMouseEvent *e )
                 if (userIntention == KMessageBox::Continue) {
                     TDEIO::Job *job = TDEIO::del( url );
                     job->setWindow( this );
-                    connect( job, TQT_SIGNAL(result( TDEIO::Job* )), TQT_SLOT(deleteJobFinished( TDEIO::Job* )) );
+                    connect( job, TQ_SIGNAL(result( TDEIO::Job* )), TQ_SLOT(deleteJobFinished( TDEIO::Job* )) );
                     TQApplication::setOverrideCursor( KCursor::workingCursor() );
                 }
             }
@@ -230,7 +230,7 @@ RadialMap::Widget::mousePressEvent( TQMouseEvent *e )
 
          m_tip->hide(); // user expects this
 
-         if (!isDir || e->button() == Qt::MidButton) {
+         if (!isDir || e->button() == TQt::MidButton) {
             TDEIconEffect::visualActivate( this, rect );
             new KRun( url, this, true ); //FIXME see above
          }

src/part/remoteLister.cpp

@@ -70,9 +70,9 @@ namespace Filelight
       setShowingDotFiles( true ); //stupid KDirLister API function names
       setMainWindow( parent );
 
-      //use TQT_SIGNAL(result(TDEIO::Job*)) instead and then use Job::error()
-      connect( this, TQT_SIGNAL(completed()), TQT_SLOT(completed()) );
-      connect( this, TQT_SIGNAL(canceled()), TQT_SLOT(canceled()) );
+      //use TQ_SIGNAL(result(TDEIO::Job*)) instead and then use Job::error()
+      connect( this, TQ_SIGNAL(completed()), TQ_SLOT(completed()) );
+      connect( this, TQ_SIGNAL(canceled()), TQ_SLOT(canceled()) );
 
       //we do this non-recursively - it is the only way!
       openURL( url );
@@ -97,7 +97,7 @@ namespace Filelight
       //as usual KDE documentation didn't suggest I needed to do this at all
       //I had to figure it out myself
       // -- avoid crash
-      TQTimer::singleShot( 0, this, TQT_SLOT(_completed()) );
+      TQTimer::singleShot( 0, this, TQ_SLOT(_completed()) );
    }
 
    void
@@ -105,7 +105,7 @@ namespace Filelight
    {
       debug() << "canceled: " << url().prettyURL() << endl;
 
-      TQTimer::singleShot( 0, this, TQT_SLOT(_completed()) );
+      TQTimer::singleShot( 0, this, TQ_SLOT(_completed()) );
    }
 
    void

src/part/remoteLister.h

@@ -10,7 +10,7 @@ namespace Filelight
 {
    class RemoteLister : public KDirLister
    {
-   Q_OBJECT
+   TQ_OBJECT
   
    public:
       RemoteLister( const KURL &url, TQWidget *parent );

src/part/scan.h

@@ -15,7 +15,7 @@ namespace Filelight
 {
    class ScanManager : public TQObject
    {
-      Q_OBJECT
+      TQ_OBJECT
   
 
       friend class LocalLister;

src/part/settingsDialog.cpp

@@ -30,26 +30,26 @@ SettingsDialog::SettingsDialog( TQWidget *parent, const char *name )
     //read in settings before you make all those nasty connections!
     reset(); //makes dialog reflect global settings
 
-    connect( &m_timer, TQT_SIGNAL(timeout()), TQT_SIGNAL(mapIsInvalid()) );
+    connect( &m_timer, TQ_SIGNAL(timeout()), TQ_SIGNAL(mapIsInvalid()) );
 
-    connect( m_addButton,    TQT_SIGNAL( clicked() ), TQT_SLOT( addDirectory() ) );
-    connect( m_removeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeDirectory() ) );
-    connect( m_resetButton,  TQT_SIGNAL( clicked() ), TQT_SLOT( reset() ) );
-    connect( m_closeButton,  TQT_SIGNAL( clicked() ), TQT_SLOT( close() ) );
+    connect( m_addButton,    TQ_SIGNAL( clicked() ), TQ_SLOT( addDirectory() ) );
+    connect( m_removeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeDirectory() ) );
+    connect( m_resetButton,  TQ_SIGNAL( clicked() ), TQ_SLOT( reset() ) );
+    connect( m_closeButton,  TQ_SIGNAL( clicked() ), TQ_SLOT( close() ) );
 
-    connect( colourSchemeGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(changeScheme( int )) );
-    connect( contrastSlider, TQT_SIGNAL(valueChanged( int )), TQT_SLOT(changeContrast( int )) );
-    connect( contrastSlider, TQT_SIGNAL(sliderReleased()), TQT_SLOT(slotSliderReleased()) );
+    connect( colourSchemeGroup, TQ_SIGNAL(clicked( int )), TQ_SLOT(changeScheme( int )) );
+    connect( contrastSlider, TQ_SIGNAL(valueChanged( int )), TQ_SLOT(changeContrast( int )) );
+    connect( contrastSlider, TQ_SIGNAL(sliderReleased()), TQ_SLOT(slotSliderReleased()) );
 
-    connect( scanAcrossMounts,       TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( startTimer() ) );
-    connect( dontScanRemoteMounts,   TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( startTimer() ) );
-    connect( dontScanRemovableMedia, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( startTimer() ) );
+    connect( scanAcrossMounts,       TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( startTimer() ) );
+    connect( dontScanRemoteMounts,   TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( startTimer() ) );
+    connect( dontScanRemovableMedia, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( startTimer() ) );
 
-    connect( useAntialiasing,    TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( toggleUseAntialiasing( bool ) ) );
-    connect( varyLabelFontSizes, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( toggleVaryLabelFontSizes( bool ) ) );
-    connect( showSmallFiles,     TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( toggleShowSmallFiles( bool ) ) );
+    connect( useAntialiasing,    TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( toggleUseAntialiasing( bool ) ) );
+    connect( varyLabelFontSizes, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( toggleVaryLabelFontSizes( bool ) ) );
+    connect( showSmallFiles,     TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( toggleShowSmallFiles( bool ) ) );
 
-    connect( minFontPitch, TQT_SIGNAL ( valueChanged( int ) ), TQT_SLOT( changeMinFontPitch( int ) ) );
+    connect( minFontPitch, TQ_SIGNAL ( valueChanged( int ) ), TQ_SLOT( changeMinFontPitch( int ) ) );
 
     m_addButton->setIconSet( SmallIcon( "document-open" ) );
     m_resetButton->setIconSet( SmallIcon( "edit-undo" ) );

src/part/settingsDialog.h

@@ -10,7 +10,7 @@
 
 class SettingsDialog : public Dialog
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:

src/part/summaryWidget.cpp

@@ -134,7 +134,7 @@ SummaryWidget::createDiskMaps()
 
         map->create( tree ); //must be done when visible
 
-        connect( map, TQT_SIGNAL(activated( const KURL& )), TQT_SIGNAL(activated( const KURL& )) );
+        connect( map, TQ_SIGNAL(activated( const KURL& )), TQ_SIGNAL(activated( const KURL& )) );
     }
 }
 

src/part/summaryWidget.h

@@ -9,7 +9,7 @@
 
 class SummaryWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:

translations/desktop_files/ru.po

@@ -1,13 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
 # blu.256 <mavridisf@gmail.com>, 2021.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-04-04 20:36+0200\n"
-"PO-Revision-Date: 2021-01-01 00:00+0000\n"
-"Last-Translator: blu.256 <mavridisf@gmail.com>\n"
+"PO-Revision-Date: 2023-11-09 00:13+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/applications/filelight-desktop-files/ru/>\n"
 "Language: ru\n"
@@ -16,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.4\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: misc/filelight.desktop:3
 msgid "Filelight"
-msgstr ""
+msgstr "Filelight"
 
 #. GenericName
 #: misc/filelight.desktop:4

translations/desktop_files/uk.po

@@ -1,30 +1,32 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Roman Savochenko <roman@oscada.org>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-04-04 20:36+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2023-10-22 16:59+0000\n"
+"Last-Translator: Roman Savochenko <roman@oscada.org>\n"
+"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/filelight-desktop-files/uk/>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Name
 #: misc/filelight.desktop:3
 msgid "Filelight"
-msgstr ""
+msgstr "Filelight"
 
 #. GenericName
 #: misc/filelight.desktop:4
 msgid "Disk Usage Statistics"
-msgstr ""
+msgstr "Статистика Використання Диску"
 
 #. Comment
 #: misc/filelight.desktop:8

translations/messages/ru.po

@@ -1,31 +1,35 @@
 # KDE3 - filelight.pot Russian translation.
 #
 # Nick Shaforostoff <shafff@ukr.net>, 2004, 2005, 2006.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: filelight\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-07-07 18:33+0000\n"
-"PO-Revision-Date: 2006-08-27 23:38+0300\n"
-"Last-Translator: Nick Shaforostoff <shafff@ukr.net>\n"
-"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
+"PO-Revision-Date: 2023-12-17 17:55+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/filelight/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Instead of a literal translation, add your name to the end of the list (separated by a comma).
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
-msgstr "Николай Шафоростов"
+msgstr "Николай Шафоростов,Андрей Степанов"
 
 #. Instead of a literal translation, add your email to the end of the list (separated by a comma).
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
-msgstr "shafff@ukr.net"
+msgstr "shafff@ukr.net,adem4ik@gmail.com"
 
 #: src/app/historyAction.cpp:46
 msgid "Forward"
@@ -33,7 +37,7 @@ msgstr "Вперёд"
 
 #: src/app/main.cpp:15
 msgid "Scan 'path'"
-msgstr "Сканировать"
+msgstr "Сканировать «путь»"
 
 #: src/app/main.cpp:21
 msgid "Graphical disk-usage information"
@@ -244,12 +248,12 @@ msgstr "Используется"
 #: misc/filelightui.rc:4
 #, no-c-format
 msgid "&Scan"
-msgstr "&Сканировать"
+msgstr "Ск&анировать"
 
 #: misc/filelightui.rc:19
 #, no-c-format
 msgid "&Go"
-msgstr "&Начать"
+msgstr "&Переход"
 
 #: misc/filelightui.rc:35
 #, no-c-format

translations/messages/uk.po

@@ -2,12 +2,13 @@
 #
 # Ivan Petrouchtchak <ivanpetrouchtchak@yahoo.com>, 2006.
 # Artem Baseniuk <atimonder1@gmail.com>, 2022.
+# Roman Savochenko <roman@oscada.org>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: filelight\n"
 "POT-Creation-Date: 2021-07-07 18:33+0000\n"
-"PO-Revision-Date: 2022-06-22 20:12+0000\n"
-"Last-Translator: Artem Baseniuk <atimonder1@gmail.com>\n"
+"PO-Revision-Date: 2023-10-22 16:59+0000\n"
+"Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/applications/filelight/uk/>\n"
 "Language: uk\n"
@@ -16,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.12.2\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Instead of a literal translation, add your name to the end of the list (separated by a comma).
 msgid ""
@@ -68,7 +69,7 @@ msgstr "Тестування"
 
 #: src/app/main.cpp:35
 msgid "Bravery in the face of unreadable code"
-msgstr ""
+msgstr "Відвага перед обличчям нечитабельного коду"
 
 #: src/app/mainWindow.cpp:40
 msgid ""
@@ -220,9 +221,8 @@ msgid "<qt><i>'%1'</i> will be <b>permanently</b> deleted."
 msgstr "<qt><i>'%1'</i> буде видалений <b>назавжди</b>."
 
 #: src/part/settingsDialog.cpp:26
-#, fuzzy
 msgid "Rainbow"
-msgstr "Райдуга"
+msgstr "Веселка"
 
 #: src/part/settingsDialog.cpp:27
 msgid "TDE Colors"