summaryrefslogtreecommitdiff
path: root/vcl/unx/kde4
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /vcl/unx/kde4
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'vcl/unx/kde4')
-rw-r--r--vcl/unx/kde4/KDE4FilePicker.cxx62
-rw-r--r--vcl/unx/kde4/KDE4FilePicker.hxx30
-rw-r--r--vcl/unx/kde4/KDESalGraphics.hxx4
-rw-r--r--vcl/unx/kde4/KDEXLib.cxx8
-rw-r--r--vcl/unx/kde4/main.cxx2
5 files changed, 53 insertions, 53 deletions
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index cd20d3da69e6..d2731b095168 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -74,23 +74,23 @@ namespace
const bool STARTUP_SUSPENDED = true;
const bool STARTUP_ALIVE = false;
- uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames()
+ uno::Sequence<OUString> SAL_CALL FilePicker_getSupportedServiceNames()
{
- uno::Sequence<rtl::OUString> aRet(3);
- aRet[0] = rtl::OUString("com.sun.star.ui.dialogs.FilePicker");
- aRet[1] = rtl::OUString("com.sun.star.ui.dialogs.SystemFilePicker");
- aRet[2] = rtl::OUString("com.sun.star.ui.dialogs.KDE4FilePicker");
+ uno::Sequence<OUString> aRet(3);
+ aRet[0] = OUString("com.sun.star.ui.dialogs.FilePicker");
+ aRet[1] = OUString("com.sun.star.ui.dialogs.SystemFilePicker");
+ aRet[2] = OUString("com.sun.star.ui.dialogs.KDE4FilePicker");
return aRet;
}
}
-rtl::OUString toOUString(const QString& s)
+OUString toOUString(const QString& s)
{
// QString stores UTF16, just like OUString
- return rtl::OUString(reinterpret_cast<const sal_Unicode*>(s.data()), s.length());
+ return OUString(reinterpret_cast<const sal_Unicode*>(s.data()), s.length());
}
-QString toQString(const rtl::OUString& s)
+QString toQString(const OUString& s)
{
return QString::fromUtf16(s.getStr(), s.getLength());
}
@@ -133,7 +133,7 @@ void SAL_CALL KDE4FilePicker::removeFilePickerListener( const uno::Reference<XFi
m_xListener.clear();
}
-void SAL_CALL KDE4FilePicker::setTitle( const rtl::OUString &title )
+void SAL_CALL KDE4FilePicker::setTitle( const OUString &title )
throw( uno::RuntimeException )
{
_dialog->setCaption(toQString(title));
@@ -194,28 +194,28 @@ void SAL_CALL KDE4FilePicker::setMultiSelectionMode( sal_Bool multiSelect )
_dialog->setMode(KFile::File | KFile::LocalOnly);
}
-void SAL_CALL KDE4FilePicker::setDefaultName( const ::rtl::OUString &name )
+void SAL_CALL KDE4FilePicker::setDefaultName( const OUString &name )
throw( uno::RuntimeException )
{
const QString url = toQString(name);
_dialog->setSelection(url);
}
-void SAL_CALL KDE4FilePicker::setDisplayDirectory( const rtl::OUString &dir )
+void SAL_CALL KDE4FilePicker::setDisplayDirectory( const OUString &dir )
throw( uno::RuntimeException )
{
const QString url = toQString(dir);
_dialog->setUrl(KUrl(url));
}
-rtl::OUString SAL_CALL KDE4FilePicker::getDisplayDirectory()
+OUString SAL_CALL KDE4FilePicker::getDisplayDirectory()
throw( uno::RuntimeException )
{
QString dir = _dialog->baseUrl().url();
return toOUString(dir);
}
-uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getFiles()
+uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getFiles()
throw( uno::RuntimeException )
{
QStringList rawFiles = _dialog->selectedFiles();
@@ -252,10 +252,10 @@ uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getFiles()
}
// add all files and leading directory to outgoing OO sequence
- uno::Sequence< ::rtl::OUString > seq(files.size());
+ uno::Sequence< OUString > seq(files.size());
for (int i = 0; i < files.size(); ++i)
{
- rtl::OUString aFile(toOUString(files[i])), aURL;
+ OUString aFile(toOUString(files[i])), aURL;
osl_getFileURLFromSystemPath(aFile.pData, &aURL.pData );
seq[i] = aURL;
}
@@ -263,13 +263,13 @@ uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getFiles()
return seq;
}
-uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getSelectedFiles()
+uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getSelectedFiles()
throw( uno::RuntimeException )
{
return getFiles();
}
-void SAL_CALL KDE4FilePicker::appendFilter( const ::rtl::OUString &title, const ::rtl::OUString &filter )
+void SAL_CALL KDE4FilePicker::appendFilter( const OUString &title, const OUString &filter )
throw( lang::IllegalArgumentException, uno::RuntimeException )
{
QString t = toQString(title);
@@ -291,7 +291,7 @@ void SAL_CALL KDE4FilePicker::appendFilter( const ::rtl::OUString &title, const
_filter.append(QString("%1|%2").arg(f).arg(t));
}
-void SAL_CALL KDE4FilePicker::setCurrentFilter( const rtl::OUString &title )
+void SAL_CALL KDE4FilePicker::setCurrentFilter( const OUString &title )
throw( lang::IllegalArgumentException, uno::RuntimeException )
{
QString t = toQString(title);
@@ -299,7 +299,7 @@ void SAL_CALL KDE4FilePicker::setCurrentFilter( const rtl::OUString &title )
_dialog->filterWidget()->setCurrentFilter(t);
}
-rtl::OUString SAL_CALL KDE4FilePicker::getCurrentFilter()
+OUString SAL_CALL KDE4FilePicker::getCurrentFilter()
throw( uno::RuntimeException )
{
// _dialog->currentFilter() wouldn't quite work, because it returns only e.g. "*.doc",
@@ -315,7 +315,7 @@ rtl::OUString SAL_CALL KDE4FilePicker::getCurrentFilter()
return toOUString(filter);
}
-void SAL_CALL KDE4FilePicker::appendFilterGroup( const rtl::OUString& , const uno::Sequence<beans::StringPair>& filters)
+void SAL_CALL KDE4FilePicker::appendFilterGroup( const OUString& , const uno::Sequence<beans::StringPair>& filters)
throw( lang::IllegalArgumentException, uno::RuntimeException )
{
const sal_uInt16 length = filters.getLength();
@@ -419,7 +419,7 @@ void SAL_CALL KDE4FilePicker::enableControl( sal_Int16 controlId, sal_Bool enabl
}
}
-void SAL_CALL KDE4FilePicker::setLabel( sal_Int16 controlId, const ::rtl::OUString &label )
+void SAL_CALL KDE4FilePicker::setLabel( sal_Int16 controlId, const OUString &label )
throw( uno::RuntimeException )
{
QWidget* widget = _customWidgets[controlId];
@@ -453,7 +453,7 @@ void SAL_CALL KDE4FilePicker::setLabel( sal_Int16 controlId, const ::rtl::OUStri
}
}
-rtl::OUString SAL_CALL KDE4FilePicker::getLabel(sal_Int16 controlId)
+OUString SAL_CALL KDE4FilePicker::getLabel(sal_Int16 controlId)
throw ( uno::RuntimeException )
{
QWidget* widget = _customWidgets[controlId];
@@ -550,7 +550,7 @@ void KDE4FilePicker::addCustomControl(sal_Int16 controlId)
if (_resMgr && resId != -1)
{
- rtl::OUString s = String(ResId( resId, *_resMgr ));
+ OUString s = String(ResId( resId, *_resMgr ));
label = toQString(s);
label.replace("~", "&");
}
@@ -591,7 +591,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args )
if (args.getLength() == 0)
{
throw lang::IllegalArgumentException(
- rtl::OUString( "no arguments" ),
+ OUString( "no arguments" ),
static_cast< XFilePicker2* >( this ), 1 );
}
@@ -601,7 +601,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args )
( arg.getValueType() != ::getCppuType((sal_Int8*)0)))
{
throw lang::IllegalArgumentException(
- rtl::OUString( "invalid argument type" ),
+ OUString( "invalid argument type" ),
static_cast< XFilePicker2* >( this ), 1 );
}
@@ -673,7 +673,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args )
default:
throw lang::IllegalArgumentException(
- rtl::OUString( "Unknown template" ),
+ OUString( "Unknown template" ),
static_cast< XFilePicker2* >( this ),
1 );
}
@@ -699,16 +699,16 @@ void SAL_CALL KDE4FilePicker::disposing( const lang::EventObject &rEvent )
}
}
-rtl::OUString SAL_CALL KDE4FilePicker::getImplementationName()
+OUString SAL_CALL KDE4FilePicker::getImplementationName()
throw( uno::RuntimeException )
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME ));
+ return OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME ));
}
-sal_Bool SAL_CALL KDE4FilePicker::supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL KDE4FilePicker::supportsService( const OUString& ServiceName )
throw( uno::RuntimeException )
{
- uno::Sequence< ::rtl::OUString > SupportedServicesNames = FilePicker_getSupportedServiceNames();
+ uno::Sequence< OUString > SupportedServicesNames = FilePicker_getSupportedServiceNames();
for ( sal_Int32 n = SupportedServicesNames.getLength(); n--; )
{
@@ -719,7 +719,7 @@ sal_Bool SAL_CALL KDE4FilePicker::supportsService( const rtl::OUString& ServiceN
return sal_False;
}
-uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getSupportedServiceNames()
throw( uno::RuntimeException )
{
return FilePicker_getSupportedServiceNames();
diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
index 1170f96597b8..01eb8084c81d 100644
--- a/vcl/unx/kde4/KDE4FilePicker.hxx
+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
@@ -88,34 +88,34 @@ public:
// XExecutableDialog functions
- virtual void SAL_CALL setTitle( const ::rtl::OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL setTitle( const OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException );
virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException );
// XFilePicker functions
virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL setDefaultName( const ::rtl::OUString &rName ) throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL setDisplayDirectory( const ::rtl::OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException );
- virtual ::rtl::OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL setDefaultName( const OUString &rName ) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException );
// XFilterManager functions
- virtual void SAL_CALL appendFilter( const ::rtl::OUString &rTitle, const ::rtl::OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL setCurrentFilter( const ::rtl::OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
- virtual ::rtl::OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException );
// XFilterGroupManager functions
- virtual void SAL_CALL appendFilterGroup( const ::rtl::OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
// XFilePickerControlAccess functions
virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL setLabel( sal_Int16 nControlId, const ::rtl::OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException);
/* TODO XFilePreview
@@ -130,7 +130,7 @@ public:
// XFilePicker2 functions
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSelectedFiles()
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles()
throw (::com::sun::star::uno::RuntimeException);
// XInitialization
@@ -148,9 +148,9 @@ public:
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString &rServiceName ) throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
+ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL supportsService( const OUString &rServiceName ) throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
private:
// prevent copy and assignment
diff --git a/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx
index 39c3a52a48ab..b25afd652564 100644
--- a/vcl/unx/kde4/KDESalGraphics.hxx
+++ b/vcl/unx/kde4/KDESalGraphics.hxx
@@ -67,7 +67,7 @@ class KDESalGraphics : public X11SalGraphics
virtual sal_Bool drawNativeControl( ControlType type, ControlPart part,
const Rectangle& rControlRegion, ControlState nControlState,
const ImplControlValue& aValue,
- const rtl::OUString& aCaption );
+ const OUString& aCaption );
/** Check if the bounding regions match.
@@ -89,7 +89,7 @@ class KDESalGraphics : public X11SalGraphics
virtual sal_Bool getNativeControlRegion( ControlType type, ControlPart part,
const Rectangle& rControlRegion, ControlState nControlState,
const ImplControlValue& aValue,
- const rtl::OUString& aCaption,
+ const OUString& aCaption,
Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
};
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 73915ee74cfe..0e5a88b16558 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -122,8 +122,8 @@ void KDEXLib::Init()
sal_uInt16 nIdx;
int nParams = osl_getCommandArgCount();
- rtl::OString aDisplay;
- rtl::OUString aParam, aBin;
+ OString aDisplay;
+ OUString aParam, aBin;
for ( nIdx = 0; nIdx < nParams; ++nIdx )
{
@@ -131,7 +131,7 @@ void KDEXLib::Init()
if ( !m_pFreeCmdLineArgs && aParam == "-display" && nIdx + 1 < nParams )
{
osl_getCommandArg( nIdx + 1, &aParam.pData );
- aDisplay = rtl::OUStringToOString( aParam, osl_getThreadTextEncoding() );
+ aDisplay = OUStringToOString( aParam, osl_getThreadTextEncoding() );
m_pFreeCmdLineArgs = new char*[ m_nFakeCmdLineArgs + 2 ];
m_pFreeCmdLineArgs[ m_nFakeCmdLineArgs + 0 ] = strdup( "-display" );
@@ -144,7 +144,7 @@ void KDEXLib::Init()
osl_getExecutableFile( &aParam.pData );
osl_getSystemPathFromFileURL( aParam.pData, &aBin.pData );
- rtl::OString aExec = rtl::OUStringToOString( aBin, osl_getThreadTextEncoding() );
+ OString aExec = OUStringToOString( aBin, osl_getThreadTextEncoding() );
m_pFreeCmdLineArgs[0] = strdup( aExec.getStr() );
m_pFreeCmdLineArgs[1] = strdup( "--nocrashhandler" );
diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx
index 45c158437b4f..1061e39e5580 100644
--- a/vcl/unx/kde4/main.cxx
+++ b/vcl/unx/kde4/main.cxx
@@ -60,7 +60,7 @@ extern "C" {
#if QT_VERSION < 0x050000
// Qt 4.x support needs >= 4.1.0
- rtl::OString aVersion( qVersion() );
+ OString aVersion( qVersion() );
SAL_INFO( "vcl.kde4", "qt version string is " << aVersion );
sal_Int32 nIndex = 0, nMajor = 0, nMinor = 0;