Remove obsolete setting of CMAKE_MODULE_PATH in cmake files.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "admin"]
 	path = admin
-	url = http://system@scm.trinitydesktop.org/scm/git/tde-common-admin
-[submodule "cmake"]
-	path = cmake
-	url = http://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
+	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin

CMakeL10n.txt

@@ -0,0 +1,22 @@
+#################################################
+#
+#  (C) 2019 Slávek Banko
+#  slavek.banko (AT) axis.cz
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+cmake_minimum_required( VERSION 3.1 )
+
+
+##### include our cmake modules #################
+
+include( TDEL10n )
+
+
+##### create translation templates ##############
+
+tde_l10n_create_template( "smb4k" )

admin

@@ -1 +1 @@
-Subproject commit 04db460623e1f235e7239f08fdcc2d0ef72636af
+Subproject commit a9e0c7eb508ebea59f1fc26d4a6858c4b6feea3e

cmake

@@ -1 +0,0 @@
-Subproject commit 1994b808819fd74446cb8f1a0491b3e10244f463

smb4k.lsm

@@ -1,14 +0,0 @@
-Begin4
-Title:          Smb4K
-Version:        R14.0.0
-Entered-date:   2010-05-10
-Description:    An advanced network neighborhood browser
-Keywords:       TDE Qt Samba network browser
-Author:         Alexander Reinholdt <dustpuppy@mail.berlios.de>
-Maintained-by:  The Trinity Desktop Environment (TDE) http://www.trinitydesktop.org/
-Primary-site:   http://git.trinitydesktop.org/cgit/
-Alternate-site:
-Original-site:  http://sourceforge.net/p/smb4k/home/Home/
-Platforms:      Linux and other Unices running TDE
-Copying-policy: GPL
-End

smb4k/browser/smb4knetworkbrowser_part.cpp

@@ -163,10 +163,10 @@ void Smb4KNetworkBrowserPart::setupActions()
   TDEAction *preview =       new TDEAction( i18n( "Pre&view" ), "view_icon", TDEShortcut( CTRL+Key_V ),
                                         this, TQT_SLOT( slotPreview() ),
                                         actionCollection(), "preview_action" );
-  TDEAction *print =         new TDEAction( i18n( "&Print File" ), "printer1", TDEShortcut( CTRL+Key_P ),
+  TDEAction *print =         new TDEAction( i18n( "&Print File" ), "printer", TDEShortcut( CTRL+Key_P ),
                                         this, TQT_SLOT( slotPrint() ),
                                         actionCollection(), "print_action" );
-  TDEAction *mount =         new TDEAction( i18n( "&Mount" ), "hdd_mount", TDEShortcut( CTRL+Key_M ),
+  TDEAction *mount =         new TDEAction( i18n( "&Mount" ), "drive-harddisk-mounted", TDEShortcut( CTRL+Key_M ),
                                         this, TQT_SLOT( slotMount() ),
                                         actionCollection(), "mount_action" );
 
@@ -200,7 +200,7 @@ void Smb4KNetworkBrowserPart::setupActions()
   // is also needed:
   if ( m_mode == KonqPlugin )
   {
-    TDEAction *unmount =     new TDEAction( i18n( "&Unmount" ), "hdd_unmount", TDEShortcut( CTRL+Key_U ),
+    TDEAction *unmount =     new TDEAction( i18n( "&Unmount" ), "drive-harddisk", TDEShortcut( CTRL+Key_U ),
                                         this, TQT_SLOT( slotUnmount() ),
                                         actionCollection(), "konq_umount_action" );
 

smb4k/browser/smb4knetworkbrowseritem.cpp

@@ -82,8 +82,8 @@ void Smb4KNetworkBrowserItem::setIcon()
     {
       if ( m_share.isPrinter() )
       {
-        m_desktop_icon = DesktopIcon( "printer1" );
-        setPixmap( 0, SmallIcon( "printer1" ) );
+        m_desktop_icon = DesktopIcon( "printer" );
+        setPixmap( 0, SmallIcon( "printer" ) );
       }
       else
       {

smb4k/configdlg/smb4tdeconfigdialog.cpp

@@ -161,7 +161,7 @@ Smb4TDEConfigDialog::Smb4TDEConfigDialog( Smb4KSettings *settings, TQWidget *par
   // Now add the pages to the configuration dialog
   addPage( interface_options, i18n( "User Interface" ), "view_choose" );
   addPage( network_options, i18n( "Network" ), "network" );
-  addPage( share_options, i18n( "Shares" ), "hdd_mount" );
+  addPage( share_options, i18n( "Shares" ), "drive-harddisk-mounted" );
   addPage( auth_options, i18n( "Authentication" ), "identity" );
   addPage( samba_options, i18n( "Samba" ), "samba" );
   addPage( rsync_options, i18n( "Synchronization" ), "go-bottom" );

smb4k/core/smb4kmounter.cpp

@@ -37,9 +37,9 @@
 #include <kdebug.h>
 
 // system includes
-#if !defined(__FreeBSD__) && !defined(__solaris__) && !defined(USE_SOLARIS)
+#if !defined(__FreeBSD__) && !defined(__sun)
 #include <sys/statfs.h>
-#elif defined(__solaris__) || defined(USE_SOLARIS)
+#elif defined(__sun)
 #include <sys/statvfs.h>
 #elif defined(__FreeBSD__)
 #include <sys/param.h>
@@ -1046,13 +1046,13 @@ void Smb4KMounter::processMount()
       TQString name = TQString( "//%1/%2" ).arg( m_priv->host() ).arg( m_priv->share() );
 
       // Check file system
-#if !defined(__solaris__)
+#if !defined(__sun)
       struct statfs filesystem;
 #else
       struct statvfs filesystem;
 #endif
 
-#if !defined(__solaris__) && !defined(__irix__)
+#if !defined(__sun) && !defined(__irix__)
       if ( statfs( m_priv->path(), &filesystem ) == -1 )
 #elif defined(__irix__)
       if ( statfs( m_priv->path(), &filesystem, sizeof( filesystem ), 0 ) == -1 )
@@ -1079,7 +1079,7 @@ void Smb4KMounter::processMount()
       }
       else
       {
-#if !defined(__FreeBSD__) && !defined(__solaris__) && !defined(__irix__)
+#if !defined(__FreeBSD__) && !defined(__sun) && !defined(__irix__)
         if ( (uint)filesystem.f_type == 0xFF534D42 /* CIFS */)
         {
           // The user name will be send if no login was specified.
@@ -1095,7 +1095,7 @@ void Smb4KMounter::processMount()
           share =  new Smb4KShare( name, m_priv->path(), "smbfs", (int)getuid(), (int)getgid() );
           m_mounted_shares.append( share );
         }
-#elif defined(__solaris__)
+#elif defined(__sun)
         if ( (uint)filesystem.f_basetype == 0xFF534D42 /* CIFS */)
         {
           // The user name will be send if no login was specified.

smb4k/iconview/smb4ksharesiconview_part.cpp

@@ -105,11 +105,11 @@ Smb4KSharesIconViewPart::~Smb4KSharesIconViewPart()
 void Smb4KSharesIconViewPart::setupActions()
 {
   // Create the actions:
-  TDEAction *unmount =   new TDEAction( i18n( "&Unmount" ), "hdd_unmount", TDEShortcut( CTRL+Key_U ),
+  TDEAction *unmount =   new TDEAction( i18n( "&Unmount" ), "drive-harddisk", TDEShortcut( CTRL+Key_U ),
                                     this, TQT_SLOT( slotUnmountShare() ),
                                     actionCollection(), "unmount_action" );
 #ifdef __linux__
-  TDEAction *force =     new TDEAction( i18n( "&Force Unmounting" ), "hdd_unmount", TDEShortcut( CTRL+Key_F ),
+  TDEAction *force =     new TDEAction( i18n( "&Force Unmounting" ), "drive-harddisk", TDEShortcut( CTRL+Key_F ),
                                     this, TQT_SLOT( slotForceUnmountShare() ),
                                     actionCollection(), "force_unmount_action" );
 #endif
@@ -138,7 +138,7 @@ void Smb4KSharesIconViewPart::setupActions()
 
   // Insert the actions into the menu:
   m_menu = new TDEActionMenu( this, "SharesIconViewMenu" );
-  m_menu->popupMenu()->insertTitle( SmallIcon( "hdd_mount" ), i18n( "Shares" ), 0 );
+  m_menu->popupMenu()->insertTitle( SmallIcon( "drive-harddisk-mounted" ), i18n( "Shares" ), 0 );
   m_menu->insert( unmount, -1 );
 #ifdef __linux__
   m_menu->insert( force, -1 );
@@ -224,12 +224,12 @@ void Smb4KSharesIconViewPart::slotContextMenuRequested( TQIconViewItem *item, co
 {
   if ( item )
   {
-    m_menu->popupMenu()->changeTitle( 0, SmallIcon( "hdd_mount" ),
+    m_menu->popupMenu()->changeTitle( 0, SmallIcon( "drive-harddisk-mounted" ),
                                       static_cast<Smb4KSharesIconViewItem *>( item )->shareObject()->name() );
   }
   else
   {
-    m_menu->popupMenu()->changeTitle( 0, SmallIcon( "hdd_mount" ), i18n( "Shares" ) );
+    m_menu->popupMenu()->changeTitle( 0, SmallIcon( "drive-harddisk-mounted" ), i18n( "Shares" ) );
   }
 
   m_menu->popupMenu()->exec( pos, 0 );

smb4k/iconview/smb4ksharesiconviewitem.cpp

@@ -94,7 +94,7 @@ void Smb4KSharesIconViewItem::setupItem( const Smb4KShare &share, bool mountpoin
       {
         TQImage over = m_loader->loadIcon( "button_cancel", TDEIcon::Desktop,
                                           0, icon_state, 0L, false ).convertToImage();
-        TQImage src = m_loader->loadIcon( "hdd_mount", TDEIcon::Desktop,
+        TQImage src = m_loader->loadIcon( "drive-harddisk-mounted", TDEIcon::Desktop,
                                          0, icon_state, 0L, false ).convertToImage();
 
         TDEIconEffect e;
@@ -105,7 +105,7 @@ void Smb4KSharesIconViewItem::setupItem( const Smb4KShare &share, bool mountpoin
       }
       else
       {
-        m_pixmap = m_loader->loadIcon( "hdd_mount", TDEIcon::Desktop,
+        m_pixmap = m_loader->loadIcon( "drive-harddisk-mounted", TDEIcon::Desktop,
                                        0, icon_state, 0L, false );
       }
 

smb4k/listview/smb4kshareslistview_part.cpp

@@ -108,11 +108,11 @@ Smb4KSharesListViewPart::~Smb4KSharesListViewPart()
 void Smb4KSharesListViewPart::setupActions()
 {
   // Create the actions:
-  TDEAction *unmount =   new TDEAction( i18n( "&Unmount" ), "hdd_unmount", TDEShortcut( CTRL+Key_U ),
+  TDEAction *unmount =   new TDEAction( i18n( "&Unmount" ), "drive-harddisk", TDEShortcut( CTRL+Key_U ),
                                     this, TQT_SLOT( slotUnmountShare() ),
                                     actionCollection(), "unmount_action" );
 #ifdef __linux__
-  TDEAction *force =     new TDEAction( i18n( "&Force Unmounting" ), "hdd_unmount", TDEShortcut( CTRL+Key_F ),
+  TDEAction *force =     new TDEAction( i18n( "&Force Unmounting" ), "drive-harddisk", TDEShortcut( CTRL+Key_F ),
                                     this, TQT_SLOT( slotForceUnmountShare() ),
                                     actionCollection(), "force_unmount_action" );
 #endif
@@ -141,7 +141,7 @@ void Smb4KSharesListViewPart::setupActions()
 
   // Insert the actions into the menu:
   m_menu = new TDEActionMenu( this, "SharesListViewMenu" );
-  m_menu->popupMenu()->insertTitle( SmallIcon( "hdd_mount" ), i18n( "Shares" ), 0 );
+  m_menu->popupMenu()->insertTitle( SmallIcon( "drive-harddisk-mounted" ), i18n( "Shares" ), 0 );
   m_menu->insert( unmount, -1 );
 #ifdef __linux__
   m_menu->insert( force, -1 );
@@ -338,12 +338,12 @@ void Smb4KSharesListViewPart::slotContextMenuRequested( TQListViewItem *item, co
 {
   if ( item )
   {
-    m_menu->popupMenu()->changeTitle( 0, SmallIcon( "hdd_mount" ),
+    m_menu->popupMenu()->changeTitle( 0, SmallIcon( "drive-harddisk-mounted" ),
                                       static_cast<Smb4KSharesListViewItem *>( item )->shareObject()->name() );
   }
   else
   {
-    m_menu->popupMenu()->changeTitle( 0, SmallIcon( "hdd_mount" ), i18n( "Shares" ) );
+    m_menu->popupMenu()->changeTitle( 0, SmallIcon( "drive-harddisk-mounted" ), i18n( "Shares" ) );
   }
 
   m_menu->popupMenu()->exec( pos, 0 );

smb4k/listview/smb4kshareslistviewitem.cpp

@@ -73,12 +73,12 @@ void Smb4KSharesListViewItem::setupItem( const Smb4KShare &share, bool mountpoin
       {
         TQImage over = m_loader->loadIcon( "button_cancel", TDEIcon::Small,
                                           0, icon_state, 0L, false ).convertToImage();
-        TQImage src = m_loader->loadIcon( "hdd_mount", TDEIcon::Small,
+        TQImage src = m_loader->loadIcon( "drive-harddisk-mounted", TDEIcon::Small,
                                          0, icon_state, 0L, false ).convertToImage();
 
         TQImage over_desk = m_loader->loadIcon( "button_cancel", TDEIcon::Desktop,
                                                0, icon_state, 0L, false ).convertToImage();
-        TQImage src_desk = m_loader->loadIcon( "hdd_mount", TDEIcon::Desktop,
+        TQImage src_desk = m_loader->loadIcon( "drive-harddisk-mounted", TDEIcon::Desktop,
                                               0, icon_state, 0L, false ).convertToImage();
 
         TDEIconEffect e;
@@ -92,10 +92,10 @@ void Smb4KSharesListViewItem::setupItem( const Smb4KShare &share, bool mountpoin
       }
       else
       {
-        pix = m_loader->loadIcon( "hdd_mount", TDEIcon::Small,
+        pix = m_loader->loadIcon( "drive-harddisk-mounted", TDEIcon::Small,
                                   0, icon_state, 0L, false );
 
-        m_desktop_pixmap = m_loader->loadIcon( "hdd_mount", TDEIcon::Desktop,
+        m_desktop_pixmap = m_loader->loadIcon( "drive-harddisk-mounted", TDEIcon::Desktop,
                                                0, icon_state, 0L, false );
       }
 

smb4k/smb4k.cpp

@@ -252,7 +252,7 @@ void Smb4KApp::setupView()
 
     if ( m_shares_part )
     {
-      KDockWidget *main = createDockWidget( "SharesView", SmallIcon( "hdd_mount" ), 0L );
+      KDockWidget *main = createDockWidget( "SharesView", SmallIcon( "drive-harddisk-mounted" ), 0L );
       main->setWidget( m_shares_part->widget() );
       main->setDockSite( KDockWidget::DockCorner );
       main->setEnableDocking( KDockWidget::DockNone );
@@ -407,7 +407,7 @@ void Smb4KApp::changeSharesView()
 
     if ( m_shares_part )
     {
-      KDockWidget *main = createDockWidget( "SharesView", SmallIcon( "hdd_mount" ), this );
+      KDockWidget *main = createDockWidget( "SharesView", SmallIcon( "drive-harddisk-mounted" ), this );
       main->setWidget( m_shares_part->widget() );
       main->setDockSite( KDockWidget::DockCorner );
       main->setEnableDocking( KDockWidget::DockNone );

smb4k/smb4ksystemtray.cpp

@@ -64,7 +64,7 @@ Smb4KSystemTray::Smb4KSystemTray( TQWidget *parent, const char *name )
   actionCollection()->setHighlightingEnabled( true );
 
   // Set up the context menu (skeleton):
-  m_shares_menu         = new TDEActionMenu( i18n( "Mounted Shares" ), "hdd_mount",
+  m_shares_menu         = new TDEActionMenu( i18n( "Mounted Shares" ), "drive-harddisk-mounted",
                           actionCollection(), "st_mounted_shares_action_menu" );
   m_bookmarks_menu      = new TDEActionMenu( i18n( "Bookmarks" ), "bookmark_folder",
                           actionCollection(), "st_bookmark_action_menu" );
@@ -763,7 +763,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
         {
           TQImage over = loader.loadIcon( "button_cancel", TDEIcon::Small,
                                          0, icon_state, 0L, false ).convertToImage();
-          TQImage src  = loader.loadIcon( "hdd_mount", TDEIcon::Small,
+          TQImage src  = loader.loadIcon( "drive-harddisk-mounted", TDEIcon::Small,
                                          0, icon_state, 0L, false ).convertToImage();
 
           TDEIconEffect e;
@@ -774,7 +774,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
         }
         else
         {
-          pix = loader.loadIcon( "hdd_mount", TDEIcon::Small,
+          pix = loader.loadIcon( "drive-harddisk-mounted", TDEIcon::Small,
                                  0, icon_state, 0L, false );
         }
 
@@ -787,11 +787,11 @@ void Smb4KSystemTray::slotSetupSharesMenu()
 
         // Define the actions that can be performed on a share from within
         // the system tray widget:
-        TDEAction *umount       = new TDEAction( i18n( "&Unmount" ), "hdd_unmount", TDEShortcut::null(), TQT_TQOBJECT(this),
+        TDEAction *umount       = new TDEAction( i18n( "&Unmount" ), "drive-harddisk", TDEShortcut::null(), TQT_TQOBJECT(this),
                                 TQT_SLOT( slotUnmountShare() ), actionCollection(), "st_[unmount]_"+(*it)->canonicalPath() );
         umount->setGroup( "ShareActions" );
 #ifdef __linux__
-        TDEAction *force_umount = new TDEAction( i18n( "&Force Unmounting" ), "hdd_unmount", TDEShortcut::null(), TQT_TQOBJECT(this),
+        TDEAction *force_umount = new TDEAction( i18n( "&Force Unmounting" ), "drive-harddisk", TDEShortcut::null(), TQT_TQOBJECT(this),
                                 TQT_SLOT( slotForceUnmountShare() ), actionCollection(), "st_[force]_"+(*it)->canonicalPath() );
         force_umount->setGroup( "ShareActions" );
         force_umount->setEnabled( Smb4KSettings::useForceUnmount() );
@@ -851,7 +851,7 @@ void Smb4KSystemTray::slotSetupSharesMenu()
 
           TQImage over = loader.loadIcon( "button_cancel", TDEIcon::Small,
                                          0, icon_state, 0L, false ).convertToImage();
-          TQImage src  = loader.loadIcon( "hdd_mount", TDEIcon::Small,
+          TQImage src  = loader.loadIcon( "drive-harddisk-mounted", TDEIcon::Small,
                                          0, icon_state, 0L, false ).convertToImage();
 
           TDEIconEffect e;

utilities/smb4k_umount.cpp

@@ -27,9 +27,9 @@
 #include <config.h>
 #endif
 
-#if !defined(__FreeBSD__) && !defined(__solaris__) && !defined(USE_SOLARIS)
+#if !defined(__FreeBSD__) && !defined(__sun)
 #include <sys/statfs.h>
-#elif defined(__solaris__) || defined(USE_SOLARIS)
+#elif defined(__sun)
 #include <sys/types.h>
 #include <sys/statvfs.h>
 #elif defined(__FreeBSD__)
@@ -138,13 +138,13 @@ bool check_filesystem( const char *path, const char *fs )
 {
 	bool ok = false;
 
-#if !defined(__solaris__) && !defined(USE_SOLARIS)
+#if !defined(__sun)
 	struct statfs filesystem;
 #else
 	struct statvfs filesystem;
 #endif
 
-#if !defined(__solaris__) && !defined(USE_SOLARIS) && !defined(__irix__)
+#if !defined(__sun) && !defined(__irix__)
 	if ( statfs( path, &filesystem ) == -1 )
 #elif defined(__irix__)
 	if ( statfs( path, &filesystem, sizeof( filesystem ), 0 ) == -1 )
@@ -168,7 +168,7 @@ bool check_filesystem( const char *path, const char *fs )
 		return ok;
 	}
 
-#if !defined(__FreeBSD__) && !defined(__solaris__) && !defined(USE_SOLARIS) && !defined(__irix__)
+#if !defined(__FreeBSD__) && !defined(__sun) && !defined(__irix__)
 	// First entry is for CIFS, the second for SMBFS.
 	if ( (uint)filesystem.f_type == 0xFF534D42 && !strncmp( fs, "cifs", strlen( fs )+1 ) )
 	{
@@ -183,7 +183,7 @@ bool check_filesystem( const char *path, const char *fs )
 	{
 		ok = true;
 	}
-#elif defined(__solaris__) || defined(USE_SOLARIS)
+#elif defined(__sun)
 	if ( (uint)filesystem.f_basetype == 0xFF534D42 && !strncmp( fs, "cifs", strlen( fs )+1 ) )
 	{
 		ok = true;