diff options
280 files changed, 906 insertions, 730 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1628a580d..e5fde6fe3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1339,6 +1339,20 @@ if( NOT WITH_${DEFAULT_SPELL_CHECKER} ) endif() +#### Check for libnm ############################ + +if( WITH_NETWORK_MANAGER_BACKEND ) + pkg_search_module( LIBNM libnm ) + if( NOT LIBNM_FOUND ) + tde_message_fatal( "libnm was requested but it was not found on your system." ) + endif( NOT LIBNM_FOUND ) + pkg_get_variable( NM_VPN_SERVICE_DIR libnm vpnservicedir ) + if( "${NM_VPN_SERVICE_DIR}" STREQUAL "" ) + set( NM_VPN_SERVICE_DIR "/usr/lib/NetworkManager/VPN" ) + endif( "${NM_VPN_SERVICE_DIR}" STREQUAL "" ) +endif( WITH_NETWORK_MANAGER_BACKEND ) + + ##### enable TDEIconLoader debugging ############ if ( WITH_TDEICONLOADER_DEBUG ) diff --git a/KDE3PORTING.html b/KDE3PORTING.html index 12b0266ed..ff595ee3e 100644 --- a/KDE3PORTING.html +++ b/KDE3PORTING.html @@ -75,7 +75,7 @@ instead, everything else is source compatible. <UL> <LI>kapp.h is now tdeapplication.h</LI> <LI>kuniqueapp.h is now tdeuniqueapplication.h</LI> -<LI>kstddirs.h is now kstandarddirs.h</LI> +<LI>kstddirs.h is now tdestandarddirs.h</LI> <LI>kcolorbtn.h is now kcolorbutton.h</LI> <LI>kxmlgui.h is now kxmlguifactory.h</LI> <LI>kdatepik.h is now kdatepicker.h</LI> diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp index 2744344e2..27e0845fa 100644 --- a/arts/kde/kartsserver.cpp +++ b/arts/kde/kartsserver.cpp @@ -21,7 +21,7 @@ #include <flowsystem.h> #include <ksimpleconfig.h> #include <tdeprocess.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqdir.h> #include <tqfile.h> #include "kartsserver.h" diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp index ec06d261d..85b8f36ba 100644 --- a/arts/knotify/knotify.cpp +++ b/arts/knotify/knotify.cpp @@ -63,7 +63,7 @@ #include <kaudiomanagerplay.h> #endif #include <tdeprocess.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeuniqueapplication.h> #include <twin.h> diff --git a/config.h.cmake b/config.h.cmake index 2f29ba382..cd2ec1c96 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -891,6 +891,9 @@ /* Defined if compiling with the network-manager backend */ #cmakedefine WITH_NETWORK_MANAGER_BACKEND 1 +/* Directory where NetworkManager VPN service files are located */ +#cmakedefine NM_VPN_SERVICE_DIR "@NM_VPN_SERVICE_DIR@" + /* Defined if compiling with old XDG standard support */ #cmakedefine WITH_OLD_XDG_STD 1 diff --git a/interfaces/tdescript/scriptmanager.cpp b/interfaces/tdescript/scriptmanager.cpp index a87cdfa67..01dab8f47 100644 --- a/interfaces/tdescript/scriptmanager.cpp +++ b/interfaces/tdescript/scriptmanager.cpp @@ -3,7 +3,7 @@ #include <tdeparts/componentfactory.h> #include <tdeapplication.h> #include <kdesktopfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <tdemessagebox.h> diff --git a/kab/addressbook.cpp b/kab/addressbook.cpp index 5b62689e6..aa1ddfdfb 100644 --- a/kab/addressbook.cpp +++ b/kab/addressbook.cpp @@ -23,7 +23,7 @@ #include <tdeapplication.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kdebug.h> #include <tdemessagebox.h> diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp index f3de71d8b..09111d14e 100644 --- a/kate/part/katedialogs.cpp +++ b/kate/part/katedialogs.cpp @@ -71,7 +71,7 @@ #include <kregexpeditorinterface.h> #include <krun.h> #include <kseparator.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdetempfile.h> #include <tqbuttongroup.h> diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp index 84177de1f..7781df55e 100644 --- a/kate/part/katedocument.cpp +++ b/kate/part/katedocument.cpp @@ -68,7 +68,7 @@ #include <kencodingfiledialog.h> #include <tdetempfile.h> #include <kmdcodec.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqtimer.h> #include <tqfile.h> @@ -2411,7 +2411,7 @@ bool KateDocument::openFile(TDEIO::Job * job) // read dir config (if possible and wanted) if (!m_reloading) - readDirConfig (); + readDirConfig (); // do we have success ? bool success = m_buffer->openFile (m_file); @@ -3135,15 +3135,27 @@ void KateDocument::backspace( KateView *view, const KateTextCursor& c ) if ((col == 0) && (line == 0)) return; + KateTextLine::Ptr tl = m_buffer->plainLine(line); + if (!tl) + { + return; + } + + // Make sure to handle surrogate pairs correctly + uint fromCol = col - 1; + TQChar prevChar = tl->getChar(col - 1); + if (prevChar.isLowSurrogate() && tl->getChar(col - 2).isHighSurrogate()) + { + fromCol = col - 2; + prevChar = tl->getChar(col - 2); + } + int complement = 0; if (col > 0) { if (config()->configFlags() & KateDocument::cfAutoBrackets) { // if inside empty (), {}, [], '', "" delete both - KateTextLine::Ptr tl = m_buffer->plainLine(line); - if(!tl) return; - TQChar prevChar = tl->getChar(col-1); TQChar nextChar = tl->getChar(col); if ( (prevChar == '"' && nextChar == '"') || @@ -3158,8 +3170,7 @@ void KateDocument::backspace( KateView *view, const KateTextCursor& c ) if (!(config()->configFlags() & KateDocument::cfBackspaceIndents)) { // ordinary backspace - //c.cursor.col--; - removeText(line, col-1, line, col+complement); + removeText(line, fromCol, line, col+complement); } else { @@ -3215,9 +3226,23 @@ void KateDocument::del( KateView *view, const KateTextCursor& c ) return; } - if( c.col() < (int) m_buffer->plainLine(c.line())->length()) + KateTextLine::Ptr tl = m_buffer->plainLine(c.line()); + if (!tl) { - removeText(c.line(), c.col(), c.line(), c.col()+1); + return; + } + uint lineLen = tl->length(); + uint col = (uint)c.col(); + if (col < lineLen) + { + // Make sure to handle surrogate pairs correctly + uint toCol = col + 1; + if (tl->getChar(col).isHighSurrogate() && tl->getChar(col + 1).isLowSurrogate()) + { + toCol = col + 2; + } + + removeText(c.line(), col, c.line(), toCol); } else if ( (uint)c.line() < lastLine() ) { diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp index 1f432468d..28cee1a3c 100644 --- a/kate/part/katehighlight.cpp +++ b/kate/part/katehighlight.cpp @@ -41,7 +41,7 @@ #include <tdepopupmenu.h> #include <tdeglobalsettings.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <kstaticdeleter.h> #include <tdeapplication.h> diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp index c20091fc1..2f91e476e 100644 --- a/kate/part/katejscript.cpp +++ b/kate/part/katejscript.cpp @@ -34,7 +34,7 @@ #include <unistd.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <tdemessagebox.h> #include <tdeconfig.h> diff --git a/kate/part/kateluaindentscript.cpp b/kate/part/kateluaindentscript.cpp index 5fd486002..f4936ef23 100644 --- a/kate/part/kateluaindentscript.cpp +++ b/kate/part/kateluaindentscript.cpp @@ -29,7 +29,7 @@ #include <tqfile.h> #include <tqfileinfo.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdeglobal.h> diff --git a/kate/part/katerenderer.cpp b/kate/part/katerenderer.cpp index 67afb4bd6..30a93b817 100644 --- a/kate/part/katerenderer.cpp +++ b/kate/part/katerenderer.cpp @@ -400,7 +400,7 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i uint nextCol = curCol + 1; // text + attrib data from line - const uchar *textAttributes = textLine->attributes (); + const uchar *textAttributes = textLine->attributes(); bool noAttribs = !textAttributes; // adjust to startcol ;) @@ -421,26 +421,29 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i while (curCol - startcol < len) { + const TQString &textString = textLine->string(); + int currCharNumCols = textString[curCol].isHighSurrogate() ? 2 : 1; + nextCol = curCol + currCharNumCols; + // make sure curPos is updated correctly. // ### if uncommented, causes an O(n^2) behaviour //Q_ASSERT(curPos == textLine->cursorX(curCol, m_tabWidth)); - TQChar curChar = textLine->string()[curCol]; // Decide if this character is a tab - we treat the spacing differently // TODO: move tab width calculation elsewhere? - bool isTab = curChar == TQChar('\t'); + bool isTab = textString[curCol] == TQChar('\t'); // Determine current syntax highlighting attribute // A bit legacy but doesn't need to change KateAttribute* curAt = (noAttribs || ((*textAttributes) >= atLen)) ? &attr[0] : &attr[*textAttributes]; // X position calculation. Incorrect for fonts with non-zero leftBearing() and rightBearing() results. - // TODO: make internal charWidth() function, use TQFontMetrics::charWidth(). - xPosAfter += curAt->width(*fs, curChar, m_tabWidth); + // TODO: make internal charWidth() function. + xPosAfter += curAt->width(*fs, textString, curCol, m_tabWidth); // Tab special treatment, move to charWidth(). if (isTab) - xPosAfter -= (xPosAfter % curAt->width(*fs, curChar, m_tabWidth)); + xPosAfter -= (xPosAfter % curAt->width(*fs, textString[curCol], m_tabWidth)); // Only draw after the starting X value // Haha, this was always wrong, due to the use of individual char width calculations...?? :( @@ -459,7 +462,9 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i curColor = isSel ? &(curAt->selectedTextColor()) : &(curAt->textColor()); // Incorporate in arbitrary highlighting - if (curAt != oldAt || curColor != oldColor || (superRanges.count() && superRanges.currentBoundary() && *(superRanges.currentBoundary()) == currentPos)) { + if (curAt != oldAt || curColor != oldColor || (superRanges.count() && + superRanges.currentBoundary() && *(superRanges.currentBoundary()) == currentPos)) + { if (superRanges.count() && superRanges.currentBoundary() && *(superRanges.currentBoundary()) == currentPos) customHL = KateArbitraryHighlightRange::merge(superRanges.rangesIncluding(currentPos)); @@ -495,10 +500,10 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i || (superRanges.count() && superRanges.currentBoundary() && *(superRanges.currentBoundary()) == KateTextCursor(line, nextCol)) // it is the end of the line OR - || (curCol - startcol >= len - 1) + || ((curCol - startcol) >= (len - currCharNumCols)) // the rest of the line is trailing whitespace OR - || (curCol + 1 >= trailingWhitespaceColumn) + || (nextCol >= trailingWhitespaceColumn) // indentation lines OR || (showIndentLines() && curCol < lastIndentColumn) @@ -514,7 +519,7 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i // the next char is a tab (removed the "and this isn't" because that's dealt with above) // i.e. we have to draw the current text so the tab can be rendered as above. - || (textLine->string()[nextCol] == TQChar('\t')) + || (textString[nextCol] == TQChar('\t')) // input method edit area || ( m_view && (isIMEdit != m_view->isIMEdit( line, nextCol )) ) @@ -557,7 +562,7 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i // If this is the last block of text, fill up to the end of the line if the // selection stretches that far - if ((curCol >= len - 1) && m_view->lineEndSelected (line, endcol)) + if (curCol >= (len - currCharNumCols) && m_view->lineEndSelected(line, endcol)) width = xEnd - oldXPos; } else @@ -632,7 +637,7 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i else { // Here's where the money is... - paint.drawText(oldXPos-xStart, y, textLine->string(), blockStartCol, nextCol-blockStartCol); + paint.drawText(oldXPos-xStart, y, textString, blockStartCol, nextCol-blockStartCol); // Draw preedit's underline if (isIMEdit) { @@ -650,7 +655,6 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i // variable advancement blockStartCol = nextCol; oldXPos = xPosAfter; - //oldS = s+1; } } // renderNow @@ -681,9 +685,8 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i oldColor = curColor; // col move - curCol++; - nextCol++; - currentPos.setCol(currentPos.col() + 1); + curCol += currCharNumCols; + currentPos.setCol(currentPos.col() + currCharNumCols); // Update the current indentation pos. if (isTab) @@ -756,8 +759,6 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, int cursorCol) if (z < len) { width = a->width(*fs, textString, z, m_tabWidth); } else { - // DF: commented out. It happens all the time. - //Q_ASSERT(!m_doc->wrapCursor()); width = a->width(*fs, TQChar(' '), m_tabWidth); } @@ -765,6 +766,11 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, int cursorCol) if (z < len && unicode[z] == TQChar('\t')) x -= x % width; + + if (textString[z].isHighSurrogate()) + { + ++z; + } } return x; @@ -803,7 +809,11 @@ uint KateRenderer::textWidth(const KateTextLine::Ptr &textLine, uint startcol, u if (unicode[z] == TQChar('\t')) x -= x % width; - if (unicode[z].isSpace()) + if (textString[z].isHighSurrogate()) + { + ++z; + } + else if (unicode[z].isSpace()) { lastWhiteSpace = z+1; lastWhiteSpaceX = x; @@ -876,7 +886,6 @@ uint KateRenderer::textWidth(const KateTextCursor &cursor) uint KateRenderer::textWidth( KateTextCursor &cursor, int xPos, uint startCol) { bool wrapCursor = m_view->wrapCursor(); - int x, oldX; KateFontStruct *fs = config()->fontStruct(); @@ -890,15 +899,17 @@ uint KateRenderer::textWidth( KateTextCursor &cursor, int xPos, uint startCol) const TQChar *unicode = textLine->text(); const TQString &textString = textLine->string(); - x = oldX = 0; + int x = 0; + int oldX = 0; + int oldZ = 0; + int width = 0; uint z = startCol; while (x < xPos && (!wrapCursor || z < len)) { oldX = x; + oldZ = z; KateAttribute* a = attribute(textLine->attribute(z)); - int width = 0; - if (z < len) width = a->width(*fs, textString, z, m_tabWidth); else @@ -909,11 +920,11 @@ uint KateRenderer::textWidth( KateTextCursor &cursor, int xPos, uint startCol) if (z < len && unicode[z] == TQChar('\t')) x -= x % width; - z++; + z += textString[z].isHighSurrogate() ? 2 : 1; } if (xPos - oldX < x - xPos && z > 0) { - z--; x = oldX; + z = oldZ; } cursor.setCol(z); return x; @@ -942,23 +953,24 @@ uint KateRenderer::textPos(const KateTextLine::Ptr &textLine, int xPos, uint sta KateFontStruct *fs = config()->fontStruct(); - int x, oldX; - x = oldX = 0; - + int x = 0; + int oldX = 0; + int oldZ = 0; uint z = startCol; const uint len = textLine->length(); const TQString &textString = textLine->string(); while ( (x < xPos) && (z < len)) { oldX = x; + oldZ = z; KateAttribute* a = attribute(textLine->attribute(z)); x += a->width(*fs, textString, z, m_tabWidth); - z++; + z += textString[z].isHighSurrogate() ? 2 : 1; } if ( ( (! nearest) || xPos - oldX < x - xPos ) && z > 0 ) { - z--; + z = oldZ; // newXPos = oldX; }// else newXPos = x; return z; diff --git a/kate/part/katesyntaxdocument.cpp b/kate/part/katesyntaxdocument.cpp index 001e478d4..40870e4b8 100644 --- a/kate/part/katesyntaxdocument.cpp +++ b/kate/part/katesyntaxdocument.cpp @@ -24,7 +24,7 @@ #include <unistd.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <tdemessagebox.h> #include <tdeconfig.h> diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp index 0f12f8562..40ab06252 100644 --- a/kate/part/kateviewinternal.cpp +++ b/kate/part/kateviewinternal.cpp @@ -1091,11 +1091,44 @@ public: void KateViewInternal::moveChar( Bias bias, bool sel ) { + if (bias == Bias::none) + { + return; + } + + KateTextLine::Ptr tl = m_doc->m_buffer->plainLine(cursor.line()); + if (!tl) + { + return; + } + + // Make sure to handle surrogate pairs correctly + int offset = 0; + int col = cursor.col(); + if (bias == Bias::left_b) + { + offset = -1; + if (tl->getChar(col - 1).isLowSurrogate() && tl->getChar(col - 2).isHighSurrogate()) + { + offset = -2; + } + } + else + { + offset = 1; + if (tl->getChar(col).isHighSurrogate() && tl->getChar(col + 1).isLowSurrogate()) + { + offset = 2; + } + } + KateTextCursor c; - if ( m_view->wrapCursor() ) { - c = WrappingCursor( this, cursor ) += bias; - } else { - c = BoundedCursor( this, cursor ) += bias; + if (m_view->wrapCursor()) + { + c = WrappingCursor( this, cursor ) += offset; + } else + { + c = BoundedCursor( this, cursor ) += offset; } updateSelection( c, sel ); diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp index cc1654cd6..4419f0254 100644 --- a/kate/part/test_regression.cpp +++ b/kate/part/test_regression.cpp @@ -32,7 +32,7 @@ #include <signal.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqimage.h> #include <tqfile.h> #include "test_regression.h" diff --git a/kded/kbuildimageiofactory.cpp b/kded/kbuildimageiofactory.cpp index b5873cad8..afb2c81a6 100644 --- a/kded/kbuildimageiofactory.cpp +++ b/kded/kbuildimageiofactory.cpp @@ -21,7 +21,7 @@ #include "kresourcelist.h" #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdelocale.h> #include <assert.h> diff --git a/kded/kbuildprotocolinfofactory.cpp b/kded/kbuildprotocolinfofactory.cpp index 921e55ab9..4259e69c7 100644 --- a/kded/kbuildprotocolinfofactory.cpp +++ b/kded/kbuildprotocolinfofactory.cpp @@ -22,7 +22,7 @@ #include "kresourcelist.h" #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kmessageboxwrapper.h> #include <kdebug.h> #include <tdelocale.h> diff --git a/kded/kbuildservicefactory.cpp b/kded/kbuildservicefactory.cpp index 6f127caf2..a06170033 100644 --- a/kded/kbuildservicefactory.cpp +++ b/kded/kbuildservicefactory.cpp @@ -24,7 +24,7 @@ #include "kmimetype.h" #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kmessageboxwrapper.h> #include <tdelocale.h> #include <kdebug.h> diff --git a/kded/kbuildservicegroupfactory.cpp b/kded/kbuildservicegroupfactory.cpp index 3903a6b39..a28eab9e9 100644 --- a/kded/kbuildservicegroupfactory.cpp +++ b/kded/kbuildservicegroupfactory.cpp @@ -22,7 +22,7 @@ #include "kresourcelist.h" #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kmessageboxwrapper.h> #include <kdebug.h> #include <tdelocale.h> diff --git a/kded/kbuildservicetypefactory.cpp b/kded/kbuildservicetypefactory.cpp index b85776166..64f07a550 100644 --- a/kded/kbuildservicetypefactory.cpp +++ b/kded/kbuildservicetypefactory.cpp @@ -22,7 +22,7 @@ #include "kresourcelist.h" #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kmessageboxwrapper.h> #include <kdebug.h> #include <tdelocale.h> diff --git a/kded/kded.cpp b/kded/kded.cpp index 4d3cecbfa..85d796652 100644 --- a/kded/kded.cpp +++ b/kded/kded.cpp @@ -43,7 +43,7 @@ #include <tdeprocess.h> #include <kdebug.h> #include <kdirwatch.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdatastream.h> #include <tdeio/global.h> #include <kservicetype.h> diff --git a/kded/khostname.cpp b/kded/khostname.cpp index 34a0c2fbf..ba9ba7d95 100644 --- a/kded/khostname.cpp +++ b/kded/khostname.cpp @@ -35,7 +35,7 @@ #include <tdelocale.h> #include <tdeaboutdata.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeprocess.h> #include <kde_file.h> diff --git a/kded/tde-menu.cpp b/kded/tde-menu.cpp index 4cf7a843e..945d70e91 100644 --- a/kded/tde-menu.cpp +++ b/kded/tde-menu.cpp @@ -30,7 +30,7 @@ #include "tdelocale.h" #include "kservice.h" #include "kservicegroup.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" static TDECmdLineOptions options[] = { { "utf8", I18N_NOOP("Output data in UTF-8 instead of local encoding"), 0 }, diff --git a/kded/tdebuildsycoca.cpp b/kded/tdebuildsycoca.cpp index 561bf9835..830d8c31e 100644 --- a/kded/tdebuildsycoca.cpp +++ b/kded/tdebuildsycoca.cpp @@ -45,7 +45,7 @@ #include <tdeglobal.h> #include <kdebug.h> #include <kdirwatch.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ksavefile.h> #include <tdelocale.h> #include <tdeaboutdata.h> diff --git a/kded/tdemimelist.cpp b/kded/tdemimelist.cpp index 673520e52..8c70cc8f5 100644 --- a/kded/tdemimelist.cpp +++ b/kded/tdemimelist.cpp @@ -2,7 +2,7 @@ #include <kservice.h> #include <kmimetype.h> #include <assert.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kservicegroup.h> #include <kimageio.h> #include <kuserprofile.h> diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp index 880a17576..6faace11f 100644 --- a/kded/vfolder_menu.cpp +++ b/kded/vfolder_menu.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kservice.h> #include <kde_file.h> diff --git a/kdoctools/main.cpp b/kdoctools/main.cpp index d44b979b5..f2238a67f 100644 --- a/kdoctools/main.cpp +++ b/kdoctools/main.cpp @@ -12,7 +12,7 @@ #include <libxslt/transform.h> #include <libxslt/xsltutils.h> #include <tqstring.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kinstance.h> #include <kdebug.h> #include <stdlib.h> diff --git a/kdoctools/main_ghelp.cpp b/kdoctools/main_ghelp.cpp index 2b2868625..c394776b7 100644 --- a/kdoctools/main_ghelp.cpp +++ b/kdoctools/main_ghelp.cpp @@ -12,7 +12,7 @@ #include <libxslt/transform.h> #include <libxslt/xsltutils.h> #include <tqstring.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kinstance.h> #include <kdebug.h> #include <stdlib.h> diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp index 9719d226b..f1afaa0da 100644 --- a/kdoctools/meinproc.cpp +++ b/kdoctools/meinproc.cpp @@ -16,7 +16,7 @@ #include <libxslt/transform.h> #include <libxslt/xsltutils.h> #include <tqstring.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kinstance.h> #include <xslt.h> #include <tqfile.h> diff --git a/kdoctools/tdeio_help.cpp b/kdoctools/tdeio_help.cpp index cdff9bd86..2c2fb0583 100644 --- a/kdoctools/tdeio_help.cpp +++ b/kdoctools/tdeio_help.cpp @@ -27,7 +27,7 @@ #include <kurl.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kinstance.h> #include "tdeio_help.h" diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp index 7973fbfbc..7798aac61 100644 --- a/kdoctools/xslt.cpp +++ b/kdoctools/xslt.cpp @@ -6,7 +6,7 @@ #include <libxml/parserInternals.h> #include <libxml/catalog.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqdir.h> #include <tqregexp.h> #include <xslt.h> diff --git a/tdeabc/address.cpp b/tdeabc/address.cpp index 80dea4e61..9f47a279e 100644 --- a/tdeabc/address.cpp +++ b/tdeabc/address.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstaticdeleter.h> #include <tqfile.h> diff --git a/tdeabc/addressbook.cpp b/tdeabc/addressbook.cpp index a472b2bd0..b124eddbe 100644 --- a/tdeabc/addressbook.cpp +++ b/tdeabc/addressbook.cpp @@ -27,7 +27,7 @@ #include <tdeglobal.h> #include <kinstance.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "errorhandler.h" #include "resource.h" diff --git a/tdeabc/addresslineedit.cpp b/tdeabc/addresslineedit.cpp index ef6537e28..8922d76e7 100644 --- a/tdeabc/addresslineedit.cpp +++ b/tdeabc/addresslineedit.cpp @@ -35,7 +35,7 @@ #include <tdecompletionbox.h> #include <tdeconfig.h> #include <kcursor.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstaticdeleter.h> #include <tdestdaccel.h> #include <kurldrag.h> diff --git a/tdeabc/distributionlist.cpp b/tdeabc/distributionlist.cpp index 3456418de..cb2b93b58 100644 --- a/tdeabc/distributionlist.cpp +++ b/tdeabc/distributionlist.cpp @@ -23,7 +23,7 @@ #include <tqvaluelist.h> #include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include "distributionlist.h" diff --git a/tdeabc/formatfactory.cpp b/tdeabc/formatfactory.cpp index 921a960c4..656cfe0cb 100644 --- a/tdeabc/formatfactory.cpp +++ b/tdeabc/formatfactory.cpp @@ -21,7 +21,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstaticdeleter.h> #include <tqfile.h> diff --git a/tdeabc/formats/binaryformat.cpp b/tdeabc/formats/binaryformat.cpp index 778a81ef7..af1728f3e 100644 --- a/tdeabc/formats/binaryformat.cpp +++ b/tdeabc/formats/binaryformat.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "addressbook.h" #include "addressee.h" diff --git a/tdeabc/lock.cpp b/tdeabc/lock.cpp index 9a08aa069..f5207f682 100644 --- a/tdeabc/lock.cpp +++ b/tdeabc/lock.cpp @@ -23,7 +23,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdetempfile.h> #include <tqfile.h> diff --git a/tdeabc/plugins/dir/resourcedir.cpp b/tdeabc/plugins/dir/resourcedir.cpp index 7502084aa..d3cde77c1 100644 --- a/tdeabc/plugins/dir/resourcedir.cpp +++ b/tdeabc/plugins/dir/resourcedir.cpp @@ -34,7 +34,7 @@ #include <kgenericfactory.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurlrequester.h> #include "addressbook.h" diff --git a/tdeabc/plugins/dir/resourcedirconfig.cpp b/tdeabc/plugins/dir/resourcedirconfig.cpp index 91512cfa6..0a4aba8f8 100644 --- a/tdeabc/plugins/dir/resourcedirconfig.cpp +++ b/tdeabc/plugins/dir/resourcedirconfig.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdialog.h> #include "formatfactory.h" diff --git a/tdeabc/plugins/file/resourcefile.cpp b/tdeabc/plugins/file/resourcefile.cpp index 2b25db4c4..f48790948 100644 --- a/tdeabc/plugins/file/resourcefile.cpp +++ b/tdeabc/plugins/file/resourcefile.cpp @@ -35,7 +35,7 @@ #include <tdeio/scheduler.h> #include <tdelocale.h> #include <ksavefile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "formatfactory.h" #include "resourcefileconfig.h" diff --git a/tdeabc/plugins/file/resourcefileconfig.cpp b/tdeabc/plugins/file/resourcefileconfig.cpp index 7995f3be1..6f9a67965 100644 --- a/tdeabc/plugins/file/resourcefileconfig.cpp +++ b/tdeabc/plugins/file/resourcefileconfig.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdialog.h> #include <unistd.h> diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp index f7c6ed36a..a2c5523af 100644 --- a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp +++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <klineedit.h> #include <tdelocale.h> #include <tdeconfig.h> diff --git a/tdeabc/stdaddressbook.cpp b/tdeabc/stdaddressbook.cpp index 2d9c81788..de30c703f 100644 --- a/tdeabc/stdaddressbook.cpp +++ b/tdeabc/stdaddressbook.cpp @@ -26,7 +26,7 @@ #include <tdelocale.h> #include <tderesources/manager.h> #include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstaticdeleter.h> #include "resource.h" diff --git a/tdeabc/tdeab2tdeabc.cpp b/tdeabc/tdeab2tdeabc.cpp index e346d9c7a..d20458288 100644 --- a/tdeabc/tdeab2tdeabc.cpp +++ b/tdeabc/tdeab2tdeabc.cpp @@ -30,7 +30,7 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "addressbook.h" #include "stdaddressbook.h" diff --git a/tdeabc/tests/kabcargl.cpp b/tdeabc/tests/kabcargl.cpp index add322b75..a348d3b02 100644 --- a/tdeabc/tests/kabcargl.cpp +++ b/tdeabc/tests/kabcargl.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <tdecmdlineargs.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "stdaddressbook.h" diff --git a/tdeabc/tests/testaddressee.cpp b/tdeabc/tests/testaddressee.cpp index 96989a06d..e7b38dd6e 100644 --- a/tdeabc/tests/testaddressee.cpp +++ b/tdeabc/tests/testaddressee.cpp @@ -3,7 +3,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdecmdlineargs.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "addressbook.h" #include "plugins/file/resourcefile.h" diff --git a/tdeabc/tests/testaddresseelist.cpp b/tdeabc/tests/testaddresseelist.cpp index e65d4379c..e422f8cde 100644 --- a/tdeabc/tests/testaddresseelist.cpp +++ b/tdeabc/tests/testaddresseelist.cpp @@ -3,7 +3,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdecmdlineargs.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "addressbook.h" #include "addresseelist.h" diff --git a/tdeabc/tests/testaddressfmt.cpp b/tdeabc/tests/testaddressfmt.cpp index bf5347f4e..ee883f7ab 100644 --- a/tdeabc/tests/testaddressfmt.cpp +++ b/tdeabc/tests/testaddressfmt.cpp @@ -3,7 +3,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdecmdlineargs.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "addressbook.h" #include "address.h" diff --git a/tdeabc/tests/testkabc.cpp b/tdeabc/tests/testkabc.cpp index 2cc7effb4..33adc671f 100644 --- a/tdeabc/tests/testkabc.cpp +++ b/tdeabc/tests/testkabc.cpp @@ -3,7 +3,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdecmdlineargs.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqfile.h> #include <tqimage.h> diff --git a/tdeabc/vcardformatimpl.cpp b/tdeabc/vcardformatimpl.cpp index 4f2ea6809..421fb64df 100644 --- a/tdeabc/vcardformatimpl.cpp +++ b/tdeabc/vcardformatimpl.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> #include <kmdcodec.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdetempfile.h> #include <VCard.h> diff --git a/tdeconf_update/tdeconf_update.cpp b/tdeconf_update/tdeconf_update.cpp index 35dbcfbf4..4e99a34e9 100644 --- a/tdeconf_update/tdeconf_update.cpp +++ b/tdeconf_update/tdeconf_update.cpp @@ -33,7 +33,7 @@ #include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeaboutdata.h> #include <kinstance.h> #include <tdetempfile.h> diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt index 2b6d4c67e..8528c4c01 100644 --- a/tdecore/CMakeLists.txt +++ b/tdecore/CMakeLists.txt @@ -56,9 +56,9 @@ install( FILES kcharsets.h tdeversion.h kpty.h tdeprocess.h tdeprocctrl.h tdelocale.h kicontheme.h kiconloader.h kdebug.h twinmodule.h twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h - kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h - kregexp.h kcompletion.h kstringhandler.h kstddirs.h - kstandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h + tdeglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h + kregexp.h kcompletion.h kstringhandler.h + tdestandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h kallocator.h kvmallocator.h tdecrash.h krfcdate.h kinstance.h kpalette.h kipc.h klibloader.h tdetempfile.h ksavefile.h krandomsequence.h knotifyclient.h kiconeffect.h kaudioplayer.h @@ -107,13 +107,13 @@ set( target tdecore ) set( ${target}_SRCS libintl.cpp tdeapplication.cpp kdebug.cpp netwm.cpp tdeconfigbase.cpp tdeconfig.cpp ksimpleconfig.cpp tdeconfigbackend.cpp - kmanagerselection.cpp kdesktopfile.cpp kstandarddirs.cpp + kmanagerselection.cpp kdesktopfile.cpp tdestandarddirs.cpp ksock.cpp kpty.cpp tdeprocess.cpp tdeprocctrl.cpp tdelocale.cpp krfcdate.cpp kiconeffect.cpp kicontheme.cpp kiconloader.cpp twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp kckey.cpp tdeshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp tdeaccelaction.cpp tdeshortcutmenu.cpp tdeaccelbase.cpp tdeaccel.cpp - kglobalaccel_x11.cpp kglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp + tdeglobalaccel_x11.cpp tdeglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp tdecrash.cpp kurl.cpp kregexp.cpp tdeglobal.cpp tdeglobalsettings.cpp kallocator.cpp kvmallocator.cpp kmimesourcefactory.cpp kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp tdetempfile.cpp diff --git a/tdecore/MAINTAINERS b/tdecore/MAINTAINERS index 39b3a1424..fef36b95d 100644 --- a/tdecore/MAINTAINERS +++ b/tdecore/MAINTAINERS @@ -28,8 +28,8 @@ kdcoppropertyproxy.cpp kdebug.cpp Stephan Kulow <[email protected]> kdesktopfile.cpp tdeglobal.cpp Stephan Kulow <[email protected]> -kglobalaccel.cpp Ellis Whitehead <[email protected]> -kglobalaccel_x11.cpp Ellis Whitehead <[email protected]> +tdeglobalaccel.cpp Ellis Whitehead <[email protected]> +tdeglobalaccel_x11.cpp Ellis Whitehead <[email protected]> tdeglobalsettings.cpp David Faure <[email protected]> kiconeffect.cpp kiconloader.cpp @@ -59,7 +59,7 @@ ksavefile.cpp Waldo Bastian <[email protected]> tdeshortcut.cpp Ellis Whitehead <[email protected]> ksimpleconfig.cpp Waldo Bastian <[email protected]> ksocks.cpp -kstandarddirs.cpp Waldo Bastian <[email protected]> +tdestandarddirs.cpp Waldo Bastian <[email protected]> tdestartupinfo.cpp Lubos Lunak <[email protected]> kstaticdeleter.cpp Stephan Kulow <[email protected]> tdestdaccel.cpp Ellis Whitehead <[email protected]> @@ -98,7 +98,7 @@ tdeconfigdialogmanager.cpp tdeconfigskeleton.cpp kdebugdcopiface.cpp Andreas Beckermann ([email protected]) (copyright) tdeversion.cpp -kglobalaccel_win.cpp Ellis Whitehead <[email protected]> (copyright) +tdeglobalaccel_win.cpp Ellis Whitehead <[email protected]> (copyright) kkeyserver_x11.cpp klockfile.cpp Waldo Bastian <[email protected]> (copyright) kmacroexpander.cpp diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am index 924362b3f..b3772b1c7 100644 --- a/tdecore/Makefile.am +++ b/tdecore/Makefile.am @@ -43,9 +43,9 @@ include_HEADERS = tdeconfig.h tdeconfigskeleton.h \ tdeuniqueapplication.h kcharsets.h tdeversion.h kpty.h tdeprocess.h \ tdeprocctrl.h tdelocale.h kicontheme.h kiconloader.h kdebug.h \ twinmodule.h twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h \ - kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h \ + tdeglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h \ kregexp.h kcompletion.h kstringhandler.h \ - kstddirs.h kstandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h \ + tdestandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h \ kallocator.h kvmallocator.h tdecrash.h krfcdate.h \ kinstance.h kpalette.h kipc.h klibloader.h tdetempfile.h ksavefile.h \ krandomsequence.h knotifyclient.h kiconeffect.h \ @@ -83,7 +83,7 @@ libtdefakes_pic.a: libtdefakes.la noinst_HEADERS = tdeaccelaction.h tdeaccelbase.h tdeaccelprivate.h kckey.h \ kcompletion_private.h netwm_p.h \ - kglobalaccel_x11.h kglobalaccel_win.h kkeyserver_x11.h kkeyserver.h \ + tdeglobalaccel_x11.h tdeglobalaccel_win.h kkeyserver_x11.h kkeyserver.h \ kregpriv.h tdeshortcutmenu.h tdesycocadict.h tdesycocafactory.h netsupp.h \ kcheckaccelerators.h kcalendarsystemgregorian.h \ kcalendarsystemhijri.h kcalendarsystemhebrew.h kcalendarsystemjalali.h \ @@ -92,12 +92,12 @@ noinst_HEADERS = tdeaccelaction.h tdeaccelbase.h tdeaccelprivate.h kckey.h \ libtdecore_la_SOURCES = libintl.cpp tdeapplication.cpp \ kdebug.cpp netwm.cpp tdeconfigbase.cpp tdeconfig.cpp ksimpleconfig.cpp \ tdeconfigbackend.cpp kmanagerselection.cpp kdesktopfile.cpp \ - kstandarddirs.cpp ksock.cpp kpty.cpp tdeprocess.cpp tdeprocctrl.cpp \ + tdestandarddirs.cpp ksock.cpp kpty.cpp tdeprocess.cpp tdeprocctrl.cpp \ tdelocale.cpp krfcdate.cpp kiconeffect.cpp kicontheme.cpp \ kiconloader.cpp twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp \ kckey.cpp tdeshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp \ tdeaccelaction.cpp tdeshortcutmenu.cpp tdeaccelbase.cpp tdeaccel.cpp \ - kglobalaccel_x11.cpp kglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp \ + tdeglobalaccel_x11.cpp tdeglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp \ tdecrash.cpp kurl.cpp kregexp.cpp tdeglobal.cpp tdeglobalsettings.cpp \ kallocator.cpp kvmallocator.cpp kmimesourcefactory.cpp \ kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp tdetempfile.cpp \ diff --git a/tdecore/configure.in.in b/tdecore/configure.in.in index 7ecda35e7..8dde23486 100644 --- a/tdecore/configure.in.in +++ b/tdecore/configure.in.in @@ -1,4 +1,4 @@ -dnl Compile in the exec prefix to help kstddirs in finding dynamic libs +dnl Compile in the exec prefix to help tdestandarddirs in finding dynamic libs AC_DEFINE_UNQUOTED(__KDE_EXECPREFIX, "$exec_prefix", [execprefix or NONE if not set, for libloading]) dnl Compile in kde_bindir to safely find tdesu_stub. diff --git a/tdecore/kapplication_win.cpp b/tdecore/kapplication_win.cpp index 2e9a8a0ba..0da2ced26 100644 --- a/tdecore/kapplication_win.cpp +++ b/tdecore/kapplication_win.cpp @@ -18,7 +18,7 @@ */ #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kurl.h> diff --git a/tdecore/kcatalogue.cpp b/tdecore/kcatalogue.cpp index 24d0193b2..d91338d1f 100644 --- a/tdecore/kcatalogue.cpp +++ b/tdecore/kcatalogue.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include "kcatalogue.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" char *k_nl_find_msg(struct kde_loaded_l10nfile *domain_file, const char *msgid); diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp index 368aaef5d..46dac11d8 100644 --- a/tdecore/kdebug.cpp +++ b/tdecore/kdebug.cpp @@ -29,7 +29,7 @@ #include "tdeapplication.h" #include "tdeglobal.h" #include "kinstance.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include <tqmessagebox.h> #include <tdelocale.h> diff --git a/tdecore/kdesktopfile.cpp b/tdecore/kdesktopfile.cpp index 3e262be3a..27b25858b 100644 --- a/tdecore/kdesktopfile.cpp +++ b/tdecore/kdesktopfile.cpp @@ -32,7 +32,7 @@ #include "kurl.h" #include "tdeconfigbackend.h" #include "tdeapplication.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "kmountpoint.h" #include "kcatalogue.h" #include "tdelocale.h" diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp index db98fbffd..8c56990d8 100644 --- a/tdecore/kiconloader.cpp +++ b/tdecore/kiconloader.cpp @@ -29,7 +29,7 @@ #include <tdeapplication.h> #include <kipc.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeconfig.h> #include <ksimpleconfig.h> diff --git a/tdecore/kicontheme.cpp b/tdecore/kicontheme.cpp index dd2cd2944..f0793f2c1 100644 --- a/tdecore/kicontheme.cpp +++ b/tdecore/kicontheme.cpp @@ -29,7 +29,7 @@ #include <tqdir.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeconfig.h> #include <ksimpleconfig.h> diff --git a/tdecore/kinstance.cpp b/tdecore/kinstance.cpp index 8ae747948..c5fe83ccc 100644 --- a/tdecore/kinstance.cpp +++ b/tdecore/kinstance.cpp @@ -31,7 +31,7 @@ #include "tdenetworkconnections.h" #endif #include "tdeaboutdata.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "kdebug.h" #include "tdeglobal.h" #include "kmimesourcefactory.h" diff --git a/tdecore/klibloader.cpp b/tdecore/klibloader.cpp index 2d33aa80b..ca77c5f8c 100644 --- a/tdecore/klibloader.cpp +++ b/tdecore/klibloader.cpp @@ -27,7 +27,7 @@ #include "tdeapplication.h" #include "klibloader.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "kdebug.h" #include "tdelocale.h" diff --git a/tdecore/kmountpoint.cpp b/tdecore/kmountpoint.cpp index 0828911ef..e5a67e0f3 100644 --- a/tdecore/kmountpoint.cpp +++ b/tdecore/kmountpoint.cpp @@ -25,7 +25,7 @@ #include <tqfile.h> -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "kmountpoint.h" diff --git a/tdecore/knotifyclient.cpp b/tdecore/knotifyclient.cpp index eaac81754..7d4c675d7 100644 --- a/tdecore/knotifyclient.cpp +++ b/tdecore/knotifyclient.cpp @@ -24,7 +24,7 @@ #include <tqptrstack.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdeconfig.h> #include <dcopclient.h> diff --git a/tdecore/kpalette.cpp b/tdecore/kpalette.cpp index 7335e8e14..66f235e5e 100644 --- a/tdecore/kpalette.cpp +++ b/tdecore/kpalette.cpp @@ -23,7 +23,7 @@ #include <tqfile.h> #include <tqtextstream.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <ksavefile.h> #include <kstringhandler.h> diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp index af48a5386..3d08cccd5 100644 --- a/tdecore/kprotocolinfo_tdecore.cpp +++ b/tdecore/kprotocolinfo_tdecore.cpp @@ -25,7 +25,7 @@ #include "kprotocolinfo.h" #include "kprotocolinfofactory.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeapplication.h> #include <kdebug.h> diff --git a/tdecore/kprotocolinfofactory.cpp b/tdecore/kprotocolinfofactory.cpp index 115a44f25..19efdc465 100644 --- a/tdecore/kprotocolinfofactory.cpp +++ b/tdecore/kprotocolinfofactory.cpp @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeapplication.h> #include <kdebug.h> diff --git a/tdecore/kpty.cpp b/tdecore/kpty.cpp index 86f5bfefa..d801b7c9a 100644 --- a/tdecore/kpty.cpp +++ b/tdecore/kpty.cpp @@ -121,7 +121,7 @@ extern "C" { #endif #include <kdebug.h> -#include <kstandarddirs.h> // locate +#include <tdestandarddirs.h> // locate #ifndef CINTR #define CINTR 0x03 diff --git a/tdecore/krfcdate.cpp b/tdecore/krfcdate.cpp index 327736b40..08691fd15 100644 --- a/tdecore/krfcdate.cpp +++ b/tdecore/krfcdate.cpp @@ -431,12 +431,16 @@ KRFCDate::parseDateISO8601( const TQString& input_ ) l = TQStringList::split(':', timeString); - if (l.size() < 3) + // If the 'T' separator was included, there must at least + // be the hour, if not then it is invalid. + if (l.size() < 1) return 0; hour = l[0].toUInt(); - min = l[1].toUInt(); - sec = l[2].toUInt(); + + // Minutes and seconds can be omitted. + min = (l.size() >= 2) ? l[1].toUInt() : 0; + sec = (l.size() >= 3) ? l[2].toUInt() : 0; time_t result = ymdhms_to_seconds(year, month, mday, hour, min, sec); diff --git a/tdecore/ksavefile.cpp b/tdecore/ksavefile.cpp index d9b8867af..9bf409c1c 100644 --- a/tdecore/ksavefile.cpp +++ b/tdecore/ksavefile.cpp @@ -38,7 +38,7 @@ #include <kde_file.h> #include "tdeapplication.h" #include "ksavefile.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" KSaveFile::KSaveFile(const TQString &filename, int mode) : mTempFile(true) diff --git a/tdecore/ksimpleconfig.cpp b/tdecore/ksimpleconfig.cpp index dc359f17e..26a201f85 100644 --- a/tdecore/ksimpleconfig.cpp +++ b/tdecore/ksimpleconfig.cpp @@ -32,7 +32,7 @@ #include <tqdir.h> #include "tdeglobal.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "tdeconfigbackend.h" #include "ksimpleconfig.h" diff --git a/tdecore/kstddirs.h b/tdecore/kstddirs.h deleted file mode 100644 index a009a750d..000000000 --- a/tdecore/kstddirs.h +++ /dev/null @@ -1,6 +0,0 @@ -// kstddirs.h is the old name, use #include <kstandarddirs.h> from now on -#ifdef KDE_NO_COMPAT -#error kstddirs.h is the old name, use #include <kstandarddirs.h> from now on -#else -#include <kstandarddirs.h> -#endif diff --git a/tdecore/ktempdir.cpp b/tdecore/ktempdir.cpp index a11e582f2..db954010e 100644 --- a/tdecore/ktempdir.cpp +++ b/tdecore/ktempdir.cpp @@ -51,7 +51,7 @@ #include "tdeapplication.h" #include "kinstance.h" #include "ktempdir.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "tdeprocess.h" #include <kdebug.h> #include "kde_file.h" diff --git a/tdecore/network/kresolverstandardworkers.cpp b/tdecore/network/kresolverstandardworkers.cpp index c10c64e97..ed083f541 100644 --- a/tdecore/network/kresolverstandardworkers.cpp +++ b/tdecore/network/kresolverstandardworkers.cpp @@ -45,7 +45,7 @@ #include "kdebug.h" #include "tdeglobal.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "tdeapplication.h" #include "kresolver.h" diff --git a/tdecore/tde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake index 14553d2e7..7c1eebbd2 100644 --- a/tdecore/tde-config.cpp.cmake +++ b/tdecore/tde-config.cpp.cmake @@ -1,7 +1,7 @@ #include <tdecmdlineargs.h> #include <tdelocale.h> #include <kinstance.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeglobalsettings.h> #include <stdio.h> diff --git a/tdecore/tde-config.cpp.in b/tdecore/tde-config.cpp.in index 86394d75d..2373a7a13 100644 --- a/tdecore/tde-config.cpp.in +++ b/tdecore/tde-config.cpp.in @@ -1,7 +1,7 @@ #include <tdecmdlineargs.h> #include <tdelocale.h> #include <kinstance.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeglobalsettings.h> #include <stdio.h> diff --git a/tdecore/tdeaboutdata.cpp b/tdecore/tdeaboutdata.cpp index 48f41645d..318a38d50 100644 --- a/tdecore/tdeaboutdata.cpp +++ b/tdecore/tdeaboutdata.cpp @@ -21,7 +21,7 @@ #include <tdeaboutdata.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqfile.h> #include <tqtextstream.h> diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp index 2cdc4b3a4..fb11f90d4 100644 --- a/tdecore/tdeapplication.cpp +++ b/tdecore/tdeapplication.cpp @@ -69,7 +69,7 @@ #endif #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdelocale.h> #include <tdestyle.h> @@ -93,7 +93,7 @@ #include <kprotocolinfo.h> #include <kkeynative.h> #include <kmdcodec.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #if defined TQ_WS_X11 #include <tdestartupinfo.h> diff --git a/tdecore/tdeconfig.cpp b/tdecore/tdeconfig.cpp index 68307dc85..4f67d5681 100644 --- a/tdecore/tdeconfig.cpp +++ b/tdecore/tdeconfig.cpp @@ -37,7 +37,7 @@ #include "tdeconfig.h" #include "tdeglobal.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "kstaticdeleter.h" #include <tqtimer.h> diff --git a/tdecore/tdeconfig_compiler/example/autoexample.cpp b/tdecore/tdeconfig_compiler/example/autoexample.cpp index 6085fa6eb..ee1233e54 100644 --- a/tdecore/tdeconfig_compiler/example/autoexample.cpp +++ b/tdecore/tdeconfig_compiler/example/autoexample.cpp @@ -31,7 +31,7 @@ #include <tdecmdlineargs.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfigdialog.h> #include <tqlabel.h> diff --git a/tdecore/tdeconfig_compiler/example/example.cpp b/tdecore/tdeconfig_compiler/example/example.cpp index 157570d98..662e60d0f 100644 --- a/tdecore/tdeconfig_compiler/example/example.cpp +++ b/tdecore/tdeconfig_compiler/example/example.cpp @@ -28,7 +28,7 @@ #include <tdecmdlineargs.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> int main( int argc, char **argv ) { diff --git a/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp index b950a3288..ec4b16b96 100644 --- a/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp +++ b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp @@ -34,7 +34,7 @@ #include <tdeglobal.h> #include <tdeconfig.h> #include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <iostream> diff --git a/tdecore/tdeconfigbackend.cpp b/tdecore/tdeconfigbackend.cpp index 43dc6eb0a..707f4fe69 100644 --- a/tdecore/tdeconfigbackend.cpp +++ b/tdecore/tdeconfigbackend.cpp @@ -45,7 +45,7 @@ #include <tdeglobal.h> #include <tdeprocess.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ksavefile.h> #include <kurl.h> #include <kde_file.h> diff --git a/tdecore/tdeconfigbase.cpp b/tdecore/tdeconfigbase.cpp index 39e491279..3f44fbc7e 100644 --- a/tdecore/tdeconfigbase.cpp +++ b/tdecore/tdeconfigbase.cpp @@ -35,7 +35,7 @@ #include "tdeconfigbase.h" #include "tdeconfigbackend.h" #include "kdebug.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "kstringhandler.h" class TDEConfigBase::TDEConfigBasePrivate diff --git a/tdecore/tdeconfigskeleton.cpp b/tdecore/tdeconfigskeleton.cpp index 03dac6156..dafe485fc 100644 --- a/tdecore/tdeconfigskeleton.cpp +++ b/tdecore/tdeconfigskeleton.cpp @@ -23,7 +23,7 @@ #include <tqvariant.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeglobalsettings.h> #include <kdebug.h> diff --git a/tdecore/tdeglobal.cpp b/tdecore/tdeglobal.cpp index aeac6f744..f00a8467c 100644 --- a/tdecore/tdeglobal.cpp +++ b/tdecore/tdeglobal.cpp @@ -38,7 +38,7 @@ #include <tdehardwaredevices.h> #include <tdenetworkconnections.h> #endif -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kinstance.h> #include "kstaticdeleter.h" diff --git a/tdecore/kglobalaccel.cpp b/tdecore/tdeglobalaccel.cpp index 5da0093a2..dd2a93b6f 100644 --- a/tdecore/kglobalaccel.cpp +++ b/tdecore/tdeglobalaccel.cpp @@ -17,15 +17,15 @@ Boston, MA 02110-1301, USA. */ -#include "kglobalaccel.h" +#include "tdeglobalaccel.h" #ifdef TQ_WS_X11 -#include "kglobalaccel_x11.h" +#include "tdeglobalaccel_x11.h" #elif defined(TQ_WS_WIN) -#include "kglobalaccel_win.h" +#include "tdeglobalaccel_win.h" #elif defined(TQ_WS_MACX) -#include "kglobalaccel_mac.h" +#include "tdeglobalaccel_mac.h" #else -#include "kglobalaccel_emb.h" +#include "tdeglobalaccel_emb.h" #endif #include <tqstring.h> @@ -136,4 +136,4 @@ bool TDEGlobalAccel::useFourModifierKeys() void TDEGlobalAccel::virtual_hook( int, void* ) { /*BASE::virtual_hook( id, data );*/ } -#include "kglobalaccel.moc" +#include "tdeglobalaccel.moc" diff --git a/tdecore/kglobalaccel.h b/tdecore/tdeglobalaccel.h index 22dedd513..be34a3cdd 100644 --- a/tdecore/kglobalaccel.h +++ b/tdecore/tdeglobalaccel.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef _KGLOBALACCEL_H_ -#define _KGLOBALACCEL_H_ +#ifndef _TDEGLOBALACCEL_H_ +#define _TDEGLOBALACCEL_H_ #include <tqobject.h> #include <tdeshortcut.h> @@ -236,4 +236,4 @@ private: class TDEGlobalAccelPrivate* d; }; -#endif // _KGLOBALACCEL_H_ +#endif // _TDEGLOBALACCEL_H_ diff --git a/tdecore/kglobalaccel_emb.h b/tdecore/tdeglobalaccel_emb.h index 5e5145d66..2fd16bd44 100644 --- a/tdecore/kglobalaccel_emb.h +++ b/tdecore/tdeglobalaccel_emb.h @@ -1,5 +1,5 @@ -#ifndef _KGLOBALACCEL_EMB_H -#define _KGLOBALACCEL_EMB_H +#ifndef _TDEGLOBALACCEL_EMB_H +#define _TDEGLOBALACCEL_EMB_H #include "tdeaccelbase.h" #include "tdeshortcut.h" @@ -15,4 +15,4 @@ public: virtual bool disconnectKey( TDEAccelAction&, KKeySequence ); }; -#endif // _KGLOBALACCEL_EMB_H +#endif // _TDEGLOBALACCEL_EMB_H diff --git a/tdecore/kglobalaccel_mac.h b/tdecore/tdeglobalaccel_mac.h index b2803b0c0..c21533916 100644 --- a/tdecore/kglobalaccel_mac.h +++ b/tdecore/tdeglobalaccel_mac.h @@ -1,5 +1,5 @@ -#ifndef _KGLOBALACCEL_MAC_H -#define _KGLOBALACCEL_MAC_H +#ifndef _TDEGLOBALACCEL_MAC_H +#define _TDEGLOBALACCEL_MAC_H #include <tqwidget.h> @@ -28,4 +28,4 @@ public: { return false; } }; -#endif // _KGLOBALACCEL_EMB_H +#endif // _TDEGLOBALACCEL_MAC_H diff --git a/tdecore/kglobalaccel_win.cpp b/tdecore/tdeglobalaccel_win.cpp index a222d0242..faf3708f4 100644 --- a/tdecore/kglobalaccel_win.cpp +++ b/tdecore/tdeglobalaccel_win.cpp @@ -22,8 +22,8 @@ #include <tqwindowdefs.h> #ifdef TQ_WS_WIN -#include "kglobalaccel_win.h" -#include "kglobalaccel.h" +#include "tdeglobalaccel_win.h" +#include "tdeglobalaccel.h" #include "kkeyserver_x11.h" #include <tqpopupmenu.h> @@ -340,6 +340,6 @@ void TDEGlobalAccelPrivate::slotActivated( int iAction ) activate( pAction, KKeySequence() ); } -#include "kglobalaccel_win.moc" +#include "tdeglobalaccel_win.moc" #endif // !TQ_WS_WIN diff --git a/tdecore/kglobalaccel_win.h b/tdecore/tdeglobalaccel_win.h index 45943b071..ec224a0f7 100644 --- a/tdecore/kglobalaccel_win.h +++ b/tdecore/tdeglobalaccel_win.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef _KGLOBALACCEL_WIN_H -#define _KGLOBALACCEL_WIN_H +#ifndef _TDEGLOBALACCEL_WIN_H +#define _TDEGLOBALACCEL_WIN_H #include <tqmap.h> #include <tqwidget.h> @@ -74,4 +74,4 @@ class TDEGlobalAccelPrivate : public TQWidget, public TDEAccelBase bool m_blockingDisabled; }; -#endif // _KGLOBALACCEL_WIN_H +#endif // _TDEGLOBALACCEL_WIN_H diff --git a/tdecore/kglobalaccel_x11.cpp b/tdecore/tdeglobalaccel_x11.cpp index a518c58c8..2bf6e0d3e 100644 --- a/tdecore/kglobalaccel_x11.cpp +++ b/tdecore/tdeglobalaccel_x11.cpp @@ -22,8 +22,8 @@ #include <tqwindowdefs.h> #ifdef TQ_WS_X11 -#include "kglobalaccel_x11.h" -#include "kglobalaccel.h" +#include "tdeglobalaccel_x11.h" +#include "tdeglobalaccel.h" #include "kkeyserver_x11.h" #include <tqpopupmenu.h> @@ -446,6 +446,6 @@ void TDEGlobalAccelPrivate::slotActivated( int iAction ) activate( pAction, KKeySequence() ); } -#include "kglobalaccel_x11.moc" +#include "tdeglobalaccel_x11.moc" #endif // !TQ_WS_X11 diff --git a/tdecore/kglobalaccel_x11.h b/tdecore/tdeglobalaccel_x11.h index 1502d89cb..2162299ee 100644 --- a/tdecore/kglobalaccel_x11.h +++ b/tdecore/tdeglobalaccel_x11.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef _KGLOBALACCEL_X11_H -#define _KGLOBALACCEL_X11_H +#ifndef _TDEGLOBALACCEL_X11_H +#define _TDEGLOBALACCEL_X11_H #include <tqmap.h> #include <tqwidget.h> @@ -107,4 +107,4 @@ class TDEGlobalAccelPrivate : public TQWidget, public TDEAccelBase bool m_suspended; }; -#endif // _KGLOBALACCEL_X11_H +#endif // _TDEGLOBALACCEL_X11_H diff --git a/tdecore/tdeglobalsettings.cpp b/tdecore/tdeglobalsettings.cpp index 8540a4435..526970e1c 100644 --- a/tdecore/tdeglobalsettings.cpp +++ b/tdecore/tdeglobalsettings.cpp @@ -42,7 +42,7 @@ static TQRgb qt_colorref2qrgb(COLORREF col) #include <kdebug.h> #include <tdeglobal.h> #include <tdeshortcut.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kcharsets.h> #include <tdeaccel.h> #include <tdelocale.h> diff --git a/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp b/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp index 754fd31b8..f41f5cbc8 100644 --- a/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp +++ b/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp @@ -1922,7 +1922,7 @@ void TDENetworkConnectionManager_BackendNM::loadConnectionInformation() { } #ifdef DEBUG_NETWORK_MANAGER_COMMUNICATIONS - printf("[network-manager comm debug] %s\n", (*it).data()); fflush(stdout); + printf("[network-manager comm debug] %s\n", (*it).local8Bit().data()); fflush(stdout); #endif // DEBUG_NETWORK_MANAGER_COMMUNICATIONS // Obtain connection settings from the path specified @@ -4941,34 +4941,39 @@ TDENetworkVPNTypeList TDENetworkConnectionManager_BackendNM::availableVPNTypes() TDENetworkVPNTypeList ret; // Query NetworkManager to verify plugin availability before claiming support for a VPN type - TQDir serviceDir(NM_PLUGIN_SERVICE_DIR, TQString(), TQDir::Name|TQDir::IgnoreCase, TQDir::Files); - TQStringList services = serviceDir.entryList ().grep (".name", true); - - if (services.count () > 0) { - // read in all available Services - for (TQStringList::Iterator i = services.begin (); i != services.end (); ++i) { - TQString service = NM_PLUGIN_SERVICE_DIR + TQString ("/") + *i; - TDEConfig* tdeconfig = new TDEConfig (service, true, true, "config"); - tdeconfig->setGroup ("VPN Connection"); - - TQString serviceName = tdeconfig->readEntry("name", TQString()); - serviceName = serviceName.lower(); - - if (serviceName == "openvpn") { - ret.append(TDENetworkVPNType::OpenVPN); - } - if (serviceName == "pptp") { - ret.append(TDENetworkVPNType::PPTP); - } - if (serviceName == "strongswan") { - ret.append(TDENetworkVPNType::StrongSwan); - } - if (serviceName == "vpnc") { - ret.append(TDENetworkVPNType::VPNC); - } + // Look in the LIB directory first, since that seems to be where plugins are stored nowadays. + TQDir libServiceDir(NM_PLUGIN_SERVICE_DIR_LIB, "*.name", TQDir::Name | TQDir::IgnoreCase, TQDir::Files); + TQDir etcServiceDir(NM_PLUGIN_SERVICE_DIR_ETC, "*.name", TQDir::Name | TQDir::IgnoreCase, TQDir::Files); + TQStringList services = libServiceDir.entryList() + etcServiceDir.entryList(); + size_t libEntryCount = libServiceDir.count(); + + // Read in all services. + for (size_t i = 0; i < services.count(); ++i) + { + TQString fileName = TQString("%1/").arg(i < libEntryCount ? NM_PLUGIN_SERVICE_DIR_LIB : NM_PLUGIN_SERVICE_DIR_ETC) + services[i]; + TDEConfig *config = new TDEConfig(fileName, true, true, "config"); + config->setGroup("VPN Connection"); - delete tdeconfig; + TQString serviceName = config->readEntry("name", TQString("")); + serviceName = serviceName.lower(); + if (serviceName == "openvpn") + { + ret.append(TDENetworkVPNType::OpenVPN); + } + if (serviceName == "pptp") + { + ret.append(TDENetworkVPNType::PPTP); + } + if (serviceName == "strongswan") + { + ret.append(TDENetworkVPNType::StrongSwan); + } + if (serviceName == "vpnc") + { + ret.append(TDENetworkVPNType::VPNC); } + + delete config; } return ret; diff --git a/tdecore/tdehw/networkbackends/network-manager/network-manager.h b/tdecore/tdehw/networkbackends/network-manager/network-manager.h index 8af99e846..241e83706 100644 --- a/tdecore/tdehw/networkbackends/network-manager/network-manager.h +++ b/tdecore/tdehw/networkbackends/network-manager/network-manager.h @@ -18,6 +18,7 @@ #ifndef _TDENETWORKBACKEND_NETWORKMANAGER_H #define _TDENETWORKBACKEND_NETWORKMANAGER_H +#include "config.h" #include "tdenetworkconnections.h" //==================================================================================================== @@ -142,7 +143,8 @@ #define NM_802_11_DEVICE_CAP_WPA 0x10 #define NM_802_11_DEVICE_CAP_RSN 0x20 //==================================================================================================== -#define NM_PLUGIN_SERVICE_DIR "/etc/NetworkManager/VPN" +#define NM_PLUGIN_SERVICE_DIR_ETC "/etc/NetworkManager/VPN" // old plugin location +#define NM_PLUGIN_SERVICE_DIR_LIB NM_VPN_SERVICE_DIR // new plugin location //==================================================================================================== //==================================================================================================== diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp index 59db6d0ae..a9e9be9da 100644 --- a/tdecore/tdehw/tdehardwaredevices.cpp +++ b/tdecore/tdehw/tdehardwaredevices.cpp @@ -25,7 +25,7 @@ #include <tqstringlist.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdelocale.h> diff --git a/tdecore/tdehw/tderootsystemdevice.cpp b/tdecore/tdehw/tderootsystemdevice.cpp index cb9016062..65194374d 100644 --- a/tdecore/tdehw/tderootsystemdevice.cpp +++ b/tdecore/tdehw/tderootsystemdevice.cpp @@ -28,7 +28,7 @@ #include "tdeglobal.h" #include "tdeconfig.h" #include "tdeapplication.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "config.h" diff --git a/tdecore/tdehw/tdestoragedevice.cpp b/tdecore/tdehw/tdestoragedevice.cpp index df5f90ab7..4ef9e71eb 100644 --- a/tdecore/tdehw/tdestoragedevice.cpp +++ b/tdecore/tdehw/tdestoragedevice.cpp @@ -34,7 +34,7 @@ #include "tdeglobal.h" #include "kiconloader.h" #include "tdetempfile.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "tdehardwaredevices.h" #include "disksHelper.h" diff --git a/tdecore/tdelocale.cpp b/tdecore/tdelocale.cpp index 3c6dc0cc8..07f3eea21 100644 --- a/tdecore/tdelocale.cpp +++ b/tdecore/tdelocale.cpp @@ -33,7 +33,7 @@ #include "kcatalogue.h" #include "tdeglobal.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "ksimpleconfig.h" #include "kinstance.h" #include "tdeconfig.h" diff --git a/tdecore/tdeprocess.cpp b/tdecore/tdeprocess.cpp index e60f30118..185bd5a6f 100644 --- a/tdecore/tdeprocess.cpp +++ b/tdecore/tdeprocess.cpp @@ -72,7 +72,7 @@ #include <tqapplication.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kuser.h> diff --git a/tdecore/tdeshortcutlist.cpp b/tdecore/tdeshortcutlist.cpp index ffacd001c..cc9961199 100644 --- a/tdecore/tdeshortcutlist.cpp +++ b/tdecore/tdeshortcutlist.cpp @@ -6,7 +6,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <kinstance.h> #include <tdeshortcut.h> #include "tdeshortcutlist.h" diff --git a/tdecore/kstandarddirs.cpp b/tdecore/tdestandarddirs.cpp index b7d41d136..89889367a 100644 --- a/tdecore/kstandarddirs.cpp +++ b/tdecore/tdestandarddirs.cpp @@ -1,4 +1,4 @@ -/* This file is part of the KDE libraries +/* This file is part of the TDE libraries Copyright (C) 1999 Sirtaj Singh Kang <[email protected]> Copyright (C) 1999 Stephan Kulow <[email protected]> Copyright (C) 1999 Waldo Bastian <[email protected]> @@ -46,7 +46,7 @@ #include <tqstring.h> #include <tqstringlist.h> -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "tdeconfig.h" #include "kinstance.h" #include "kshell.h" @@ -74,7 +74,7 @@ public: TQStringList xdgconf_prefixes; }; -// Singleton, with data shared by all kstandarddirs instances. +// Singleton, with data shared by all tdestandarddirs instances. // Used in static methods like findExe() class TDEStandardDirsSingleton { @@ -441,7 +441,7 @@ TQString TDEStandardDirs::findResourceDir( const char *type, #ifndef NDEBUG if(false && strcmp(type, "locale")) - fprintf(stderr, "KStdDirs::findResDir(): can't find \"%s\" in type \"%s\".\n", filename.ascii(), type); + fprintf(stderr, "TDEStandardDirs::findResourceDir(): can't find \"%s\" in type \"%s\".\n", filename.ascii(), type); #endif return TQString::null; diff --git a/tdecore/kstandarddirs.h b/tdecore/tdestandarddirs.h index e40f7617f..b221ecd41 100644 --- a/tdecore/kstandarddirs.h +++ b/tdecore/tdestandarddirs.h @@ -1,5 +1,5 @@ /* - This file is part of the KDE libraries + This file is part of the TDE libraries Copyright (C) 1999 Sirtaj Singh Kang <[email protected]> Copyright (C) 1999 Stephan Kulow <[email protected]> Copyright (C) 1999 Waldo Bastian <[email protected]> @@ -20,8 +20,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef SSK_KSTDDIRS_H -#define SSK_KSTDDIRS_H +#ifndef _TDESTANDARDDIRS_H +#define _TDESTANDARDDIRS_H #include <tqstring.h> #include <tqdict.h> @@ -32,7 +32,7 @@ class TDEConfig; class TDEStandardDirsPrivate; /** - * @short Site-independent access to standard KDE directories. + * @short Site-independent access to standard TDE directories. * @author Stephan Kulow <[email protected]> and Sirtaj Singh Kang <[email protected]> * * This is one of the most central classes in tdelibs as @@ -46,9 +46,9 @@ class TDEStandardDirsPrivate; * (e.g. icon) and a filename (e.g. khexdit.xpm). In an ideal world * the application would make no assumption where this file is and * leave it up to TDEStandardDirs::findResource("apps", "Home.desktop") - * to apply this knowledge to return /opt/kde/share/applnk/Home.desktop + * to apply this knowledge to return /opt/trinity/share/applnk/Home.desktop * or ::locate("data", "kgame/background.jpg") to return - * /opt/kde/share/apps/kgame/background.jpg + * /opt/trinity/share/apps/kgame/background.jpg * * The main idea behind TDEStandardDirs is that there are several * toplevel prefixes below which the files lie. One of these prefixes is @@ -70,7 +70,7 @@ class TDEStandardDirsPrivate; * * @li apps - Applications menu (.desktop files). * @li cache - Cached information (e.g. favicons, web-pages) - * @li cgi - CGIs to run from kdehelp. + * @li cgi - CGIs to run from tdehelp. * @li config - Configuration files. * @li data - Where applications store data. * @li exe - Executables in $prefix/bin. findExe() for a function that takes $PATH into account. @@ -116,7 +116,7 @@ class TDEStandardDirsPrivate; * used to search for resources first. If TDEHOME is not * specified it defaults to "$HOME/.trinity" * @li TDEROOTHOME: Like TDEHOME, but used for the root user. - * If TDEROOTHOME is not set it defaults to the .kde directory in the + * If TDEROOTHOME is not set it defaults to the .trinity directory in the * home directory of root, usually "/root/.trinity". * Note that the setting of $HOME is ignored in this case. * @@ -140,7 +140,7 @@ public: * * @li When compiling tdelibs, the prefix is added to this. * @li TDEDIRS or TDEDIR is taking into account - * @li Additional dirs may be loaded from kdeglobals. + * @li Additional dirs may be loaded from tdeglobals. * * @param dir The directory to append relative paths to. */ @@ -169,7 +169,7 @@ public: * * You may add as many as you need, but it is advised that there * is exactly one to make writing definite. - * All basic types ( kde_default) are added by addKDEDefaults(), + * All basic types (kde_default) are added by addKDEDefaults(), * but for those you can add more relative paths as well. * * The later a suffix is added, the higher its priority. Note, that the @@ -214,7 +214,7 @@ public: * to findResource("lib", "libtdecore.la"). TDEStandardDirs will * then look into the subdir lib of all elements of all prefixes * ($TDEDIRS) for a file libtdecore.la and return the path to - * the first one it finds (e.g. /opt/kde/lib/libtdecore.la) + * the first one it finds (e.g. /opt/trinity/lib/libtdecore.la) * * @param type The type of the wanted resource * @param filename A relative filename of the resource. @@ -262,7 +262,7 @@ public: * Tries to find all directories whose names consist of the * specified type and a relative path. So would * findDirs("apps", "Settings") return - * @li /opt/kde/share/applnk/Settings/ + * @li /opt/trinity/share/applnk/Settings/ * @li /home/joe/.trinity/share/applnk/Settings/ * * Note that it appends / to the end of the directories, @@ -288,7 +288,7 @@ public: * * findResourceDir("lib", "libtdecore.la") would return the * path of the subdir libtdecore.la is found first in - * (e.g. /opt/kde/lib/) + * (e.g. /opt/trinity/lib/) * * @param type The type of the wanted resource * @param filename A relative filename of the resource. @@ -409,7 +409,7 @@ public: /** * This function adds the defaults that are used by the current - * KDE version. + * TDE version. * * It's a series of addResourceTypes() * and addPrefix() calls. @@ -446,7 +446,7 @@ public: * This function will return a list of all the types that TDEStandardDirs * supports. * - * @return All types that KDE supports + * @return All types that TDE supports */ TQStringList allTypes() const; @@ -501,7 +501,7 @@ public: static bool makeDir(const TQString& dir, int mode = 0755); /** - * This returns a default relative path for the standard KDE + * This returns a default relative path for the standard TDE * resource types. Below is a list of them so you get an idea * of what this is all about. * @@ -554,13 +554,13 @@ public: /** * @internal - * Returns the default toplevel directory where KDE is installed. + * Returns the default toplevel directory where TDE is installed. */ static TQString kfsstnd_defaultprefix(); /** * @internal - * Returns the default bin directory in which KDE executables are stored. + * Returns the default bin directory in which TDE executables are stored. */ static TQString kfsstnd_defaultbindir(); @@ -649,12 +649,12 @@ public: * @{ * On The Usage Of 'locate' and 'locateLocal' * - * Typical KDE applications use resource files in one out of + * Typical TDE applications use resource files in one out of * three ways: * * 1) A resource file is read but is never written. A system * default is supplied but the user can override this - * default in his local .kde directory: + * default in his local .trinity directory: * * \code * // Code example @@ -665,7 +665,7 @@ public: * 2) A resource file is read and written. If the user has no * local version of the file the system default is used. * The resource file is always written to the users local - * .kde directory. + * .trinity directory. * * \code * // Code example @@ -681,7 +681,7 @@ public: * 3) A resource file is read and written. No system default * is used if the user has no local version of the file. * The resource file is always written to the users local - * .kde directory. + * .trinity directory. * * \code * // Code example @@ -726,4 +726,4 @@ TDECORE_EXPORT TQString locateLocal( const char *type, const TQString& filename, /*! @} */ -#endif // SSK_KSTDDIRS_H +#endif // _TDESTANDARDDIRS_H diff --git a/tdecore/tdesycoca.cpp b/tdecore/tdesycoca.cpp index fff419532..80764faec 100644 --- a/tdecore/tdesycoca.cpp +++ b/tdecore/tdesycoca.cpp @@ -31,7 +31,7 @@ #include <tdeglobal.h> #include <kdebug.h> #include <tdeprocess.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <assert.h> #include <stdlib.h> diff --git a/tdecore/tdetempfile.cpp b/tdecore/tdetempfile.cpp index 805d315a1..d498f1258 100644 --- a/tdecore/tdetempfile.cpp +++ b/tdecore/tdetempfile.cpp @@ -52,7 +52,7 @@ #include "tdeapplication.h" #include "kinstance.h" #include "tdetempfile.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "kde_file.h" #include "kdebug.h" diff --git a/tdecore/tdeuniqueapplication.cpp b/tdecore/tdeuniqueapplication.cpp index 1614ac3d7..85904a622 100644 --- a/tdecore/tdeuniqueapplication.cpp +++ b/tdecore/tdeuniqueapplication.cpp @@ -35,7 +35,7 @@ #include <dcopclient.h> #include <tdecmdlineargs.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeaboutdata.h> #if defined TQ_WS_X11 diff --git a/tdecore/tests/CMakeLists.txt b/tdecore/tests/CMakeLists.txt index e79dbfdeb..19b1fa9d3 100644 --- a/tdecore/tests/CMakeLists.txt +++ b/tdecore/tests/CMakeLists.txt @@ -30,23 +30,41 @@ tde_add_library( tdeconfigtest SHARED AUTOMOC EXCLUDE_FROM_ALL ) -set( CHECKS - tdeconfigtestgui klocaletest tdeprocesstest ksimpleconfigtest kstddirstest - tdeuniqueapptest ktempfiletest krandomsequencetest kdebugtest - ksocktest kstringhandlertest kcmdlineargstest tdeapptest kmemtest - dcopkonqtest kipctest cplusplustest kiconloadertest kresolvertest - kmdcodectest knotifytest ksortablevaluelisttest krfcdatetest testqtargs - tdeprociotest kcharsetstest kcalendartest kmacroexpandertest kshelltest - kxerrorhandlertest startserviceby kglobaltest ktimezonestest +set( AUTOMATED_CHECKS + kcharsetstest kglobaltest kmacroexpandertest krfcdatetest + kstringhandlertest kurltest tdestdacceltest + + # cplusplustest # -- skip (doesn't error on errors) + # ksimpleconfigtest # -- skip (doesn't error on errors) + # ksortablevaluelist # -- skip (doesn't error on errors) + # ksocktest # -- skip due to DNS failure ) +# Tests that require some graphical interaction / confirmation. +set( MANUAL_CHECKS_GUI + kdebugtest klocaletest knotifytest kxerrorhandlertest + startserviceby tdeconfigtestgui tdeprocesstest testqtargs +) -foreach( _check ${CHECKS} ) - tde_add_check_executable( ${_check} AUTOMOC LINK tdeconfigtest-shared ) +# Tests that require some interaction using a terminal +set( MANUAL_CHECKS_TUI + dcopkonqtest kcalendartest kcmdlineargstest kiconloadertest + kipctest kmemtest krandomsequencetest kresolvertest + kmdcodectest kshelltest ktempfiletest ktimezonestest + tdeapptest tdeprociotest tdestandarddirstest tdeuniqueapptest +) + +foreach( _check ${AUTOMATED_CHECKS} ) + tde_add_check_executable( ${_check} AUTOMOC LINK tdeconfigtest-shared TEST ) endforeach( ) -tde_add_check_executable( kurltest AUTOMOC LINK tdeconfigtest-shared TEST ) -tde_add_check_executable( tdestdacceltest AUTOMOC LINK tdeconfigtest-shared TEST ) +foreach( _check ${MANUAL_CHECKS_GUI}) + tde_add_check_executable( ${_check} AUTOMOC LINK tdeconfigtest-shared ) +endforeach() + +foreach( _check ${MANUAL_CHECKS_TUI}) + tde_add_check_executable( ${_check} AUTOMOC LINK tdeconfigtest-shared ) +endforeach() tde_add_check_executable( kidlservertest AUTOMOC SOURCES KIDLTest.cpp KIDLTest.skel LINK tdeconfigtest-shared ) diff --git a/tdecore/tests/Makefile.am b/tdecore/tests/Makefile.am index cbf12cb2c..b7d4dc88e 100644 --- a/tdecore/tests/Makefile.am +++ b/tdecore/tests/Makefile.am @@ -22,7 +22,7 @@ INCLUDES = -I$(top_srcdir)/tdecore $(all_includes) AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH) check_PROGRAMS = tdeconfigtestgui klocaletest tdeprocesstest ksimpleconfigtest \ - kstddirstest kurltest tdeuniqueapptest ktempfiletest krandomsequencetest \ + tdestandarddirstest kurltest tdeuniqueapptest ktempfiletest krandomsequencetest \ kdebugtest ksocktest kstringhandlertest kcmdlineargstest tdeapptest \ kmemtest kidlservertest kidlclienttest dcopkonqtest kipctest \ cplusplustest kiconloadertest kresolvertest kmdcodectest knotifytest \ @@ -45,7 +45,7 @@ klocaletest_SOURCES = klocaletest.cpp #kcatalogue_SOURCES = kcatalogue.cpp libintl.cpp ksimpleconfigtest_SOURCES = ksimpleconfigtest.cpp kurltest_SOURCES = kurltest.cpp -kstddirstest_SOURCES = kstddirstest.cpp +tdestandarddirstest_SOURCES = tdestandarddirstest.cpp tdeprocesstest_SOURCES = tdeprocesstest.cpp tdeuniqueapptest_SOURCES = tdeuniqueapptest.cpp tdeapptest_SOURCES = tdeapptest.cpp diff --git a/tdecore/tests/krfcdatetest.cpp b/tdecore/tests/krfcdatetest.cpp index 94358a8f1..c67c5a4e2 100644 --- a/tdecore/tests/krfcdatetest.cpp +++ b/tdecore/tests/krfcdatetest.cpp @@ -59,6 +59,12 @@ int main(int argc, char *argv[]) a = KRFCDate::parseDateISO8601("1994-01-01"); check( "1994-01-01", a, b ); + a = KRFCDate::parseDateISO8601("1994-01-01T12"); + check("1994-01-01T12", a, b); + + a = KRFCDate::parseDateISO8601("1994-01-01T12:00"); + check("1994-01-01T12:00", a, b); + b = 0; // pass RFC date to ISO parser diff --git a/tdecore/tests/ktempfiletest.cpp b/tdecore/tests/ktempfiletest.cpp index 019db0690..38960bf1a 100644 --- a/tdecore/tests/ktempfiletest.cpp +++ b/tdecore/tests/ktempfiletest.cpp @@ -18,7 +18,7 @@ #include "tdetempfile.h" #include "tdeapplication.h" -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include <tqstring.h> #include <unistd.h> diff --git a/tdecore/tests/kstddirstest.cpp b/tdecore/tests/tdestandarddirstest.cpp index ae6ea16bd..53d76a83c 100644 --- a/tdecore/tests/kstddirstest.cpp +++ b/tdecore/tests/tdestandarddirstest.cpp @@ -1,7 +1,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kinstance.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> int main(int argc, char **argv) diff --git a/tdehtml/css/cssstyleselector.cpp b/tdehtml/css/cssstyleselector.cpp index e9517584e..82d7d6604 100644 --- a/tdehtml/css/cssstyleselector.cpp +++ b/tdehtml/css/cssstyleselector.cpp @@ -55,7 +55,7 @@ using namespace DOM; #include "tdehtmlview.h" #include "tdehtml_part.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kcharsets.h> #include <tdeglobal.h> #include <tdeconfig.h> diff --git a/tdehtml/ecma/kjs_navigator.cpp b/tdehtml/ecma/kjs_navigator.cpp index 90ce501db..c68121f0e 100644 --- a/tdehtml/ecma/kjs_navigator.cpp +++ b/tdehtml/ecma/kjs_navigator.cpp @@ -22,7 +22,7 @@ #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/tdehtml/java/kjavaappletserver.cpp b/tdehtml/java/kjavaappletserver.cpp index cf7f12590..6b546196b 100644 --- a/tdehtml/java/kjavaappletserver.cpp +++ b/tdehtml/java/kjavaappletserver.cpp @@ -30,7 +30,7 @@ #include <tdelocale.h> #include <tdeparts/browserextension.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeio/job.h> #include <tdeio/tdeprotocolmanager.h> diff --git a/tdehtml/misc/knsplugininstaller.cpp b/tdehtml/misc/knsplugininstaller.cpp index aefa73192..44e74b976 100644 --- a/tdehtml/misc/knsplugininstaller.cpp +++ b/tdehtml/misc/knsplugininstaller.cpp @@ -27,7 +27,7 @@ #include <tdediroperator.h> #include <tdelistview.h> #include <tdelocale.h> -#include <kstddirs.h> +#include <tdestandarddirs.h> #include <tdetempfile.h> #include <netaccess.h> diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp index 5a5dbaa58..81d6d748a 100644 --- a/tdehtml/tdehtml_ext.cpp +++ b/tdehtml/tdehtml_ext.cpp @@ -54,7 +54,7 @@ #include <kstringhandler.h> #include <tdeapplication.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <krun.h> #include <kurifilter.h> #include <kiconloader.h> diff --git a/tdehtml/tdehtml_pagecache.cpp b/tdehtml/tdehtml_pagecache.cpp index df08f97d6..e578144c9 100644 --- a/tdehtml/tdehtml_pagecache.cpp +++ b/tdehtml/tdehtml_pagecache.cpp @@ -22,7 +22,7 @@ #include <kstaticdeleter.h> #include <tdetempfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqintdict.h> #include <tqtimer.h> diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp index 81cd2fa97..3b58afe8f 100644 --- a/tdehtml/tdehtml_part.cpp +++ b/tdehtml/tdehtml_part.cpp @@ -72,7 +72,7 @@ using namespace DOM; #include <dcopclient.h> #include <dcopref.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstringhandler.h> #include <tdeio/job.h> #include <tdeio/global.h> diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp index 8aac65a36..a351a5f74 100644 --- a/tdehtml/tdehtmlview.cpp +++ b/tdehtml/tdehtmlview.cpp @@ -71,7 +71,7 @@ #include <knotifyclient.h> #include <kprinter.h> #include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdestdaccel.h> #include <kstringhandler.h> #include <kurldrag.h> diff --git a/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp index 12769358e..c564dd92e 100644 --- a/tdehtml/test_regression.cpp +++ b/tdehtml/test_regression.cpp @@ -31,7 +31,7 @@ #include <signal.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqimage.h> #include <tqfile.h> #include "test_regression.h" diff --git a/tdeinit/autostart.cpp b/tdeinit/autostart.cpp index abc3c2ef3..860eff2ee 100644 --- a/tdeinit/autostart.cpp +++ b/tdeinit/autostart.cpp @@ -25,7 +25,7 @@ #include <tdeconfig.h> #include <kdesktopfile.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <stdlib.h> diff --git a/tdeinit/tdedostartupconfig.cpp b/tdeinit/tdedostartupconfig.cpp index 9125b6cbf..b9a0e55b6 100644 --- a/tdeinit/tdedostartupconfig.cpp +++ b/tdeinit/tdedostartupconfig.cpp @@ -29,7 +29,7 @@ DEALINGS IN THE SOFTWARE. #include <tqfile.h> #include <tqtextstream.h> #include <kinstance.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/tdeinit/tdeinit.cpp b/tdeinit/tdeinit.cpp index e8c7dd2ae..debe0be12 100644 --- a/tdeinit/tdeinit.cpp +++ b/tdeinit/tdeinit.cpp @@ -53,7 +53,7 @@ #include <tqregexp.h> #include <tqfont.h> #include <kinstance.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeconfig.h> #include <klibloader.h> diff --git a/tdeinit/tdelauncher.cpp b/tdeinit/tdelauncher.cpp index a65493979..371f1ba7b 100644 --- a/tdeinit/tdelauncher.cpp +++ b/tdeinit/tdelauncher.cpp @@ -36,7 +36,7 @@ #include <tdeprotocolmanager.h> #include <kprotocolinfo.h> #include <krun.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdetempfile.h> #include <kurl.h> diff --git a/tdeio/bookmarks/kbookmarkimporter_crash.cpp b/tdeio/bookmarks/kbookmarkimporter_crash.cpp index b2185d46e..ed8620a85 100644 --- a/tdeio/bookmarks/kbookmarkimporter_crash.cpp +++ b/tdeio/bookmarks/kbookmarkimporter_crash.cpp @@ -23,7 +23,7 @@ #include <tdelocale.h> #include <kdebug.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqfile.h> #include <tqdir.h> #include <tqstring.h> diff --git a/tdeio/bookmarks/kbookmarkmanager.cpp b/tdeio/bookmarks/kbookmarkmanager.cpp index 56713b981..8a73b2b31 100644 --- a/tdeio/bookmarks/kbookmarkmanager.cpp +++ b/tdeio/bookmarks/kbookmarkmanager.cpp @@ -23,7 +23,7 @@ #include "kbookmarkimporter.h" #include <kdebug.h> #include <krun.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ksavefile.h> #include <dcopref.h> #include <tqregexp.h> diff --git a/tdeio/kssl/kssl.cpp b/tdeio/kssl/kssl.cpp index 0f34a55da..9131ce8d9 100644 --- a/tdeio/kssl/kssl.cpp +++ b/tdeio/kssl/kssl.cpp @@ -40,7 +40,7 @@ #include "kssl.h" #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ksock.h> #include <ksockaddr.h> diff --git a/tdeio/kssl/ksslcertificate.cpp b/tdeio/kssl/ksslcertificate.cpp index 774553939..d3f784fec 100644 --- a/tdeio/kssl/ksslcertificate.cpp +++ b/tdeio/kssl/ksslcertificate.cpp @@ -35,7 +35,7 @@ #include "ksslcertchain.h" #include "ksslutils.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kmdcodec.h> #include <tdelocale.h> #include <tqdatetime.h> diff --git a/tdeio/kssl/ksslinfodlg.cpp b/tdeio/kssl/ksslinfodlg.cpp index d7fb0e936..2e0b80399 100644 --- a/tdeio/kssl/ksslinfodlg.cpp +++ b/tdeio/kssl/ksslinfodlg.cpp @@ -39,7 +39,7 @@ #include <ksqueezedtextlabel.h> #include <kurllabel.h> #include <kstdguiitem.h> -//#include <kstandarddirs.h> +//#include <tdestandarddirs.h> //#include <krun.h> #include <kcombobox.h> #include "ksslcertificate.h" diff --git a/tdeio/kssl/ksslkeygen.cpp b/tdeio/kssl/ksslkeygen.cpp index aad837d7d..595b4ebcd 100644 --- a/tdeio/kssl/ksslkeygen.cpp +++ b/tdeio/kssl/ksslkeygen.cpp @@ -29,7 +29,7 @@ #include <tdemessagebox.h> #include <kopenssl.h> #include <kprogress.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdetempfile.h> #include <tdewallet.h> diff --git a/tdeio/kssl/ksslsettings.cpp b/tdeio/kssl/ksslsettings.cpp index aaf17cf97..354120d8d 100644 --- a/tdeio/kssl/ksslsettings.cpp +++ b/tdeio/kssl/ksslsettings.cpp @@ -33,7 +33,7 @@ #include "ksslsettings.h" #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> // this hack provided by Malte Starostik to avoid glibc/openssl bug diff --git a/tdeio/misc/kssld/kssld.cpp b/tdeio/misc/kssld/kssld.cpp index 3a04d93f0..83d0b8412 100644 --- a/tdeio/misc/kssld/kssld.cpp +++ b/tdeio/misc/kssld/kssld.cpp @@ -42,7 +42,7 @@ #include <unistd.h> #include <tqfile.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tqdatetime.h> diff --git a/tdeio/misc/tdewalletd/tdewalletd.cpp b/tdeio/misc/tdewalletd/tdewalletd.cpp index 6c8f722d7..dc1d95ced 100644 --- a/tdeio/misc/tdewalletd/tdewalletd.cpp +++ b/tdeio/misc/tdewalletd/tdewalletd.cpp @@ -36,7 +36,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kpassdlg.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdewalletentry.h> #include <twin.h> diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp index 40e26ed43..7a6241299 100644 --- a/tdeio/misc/uiserver.cpp +++ b/tdeio/misc/uiserver.cpp @@ -26,7 +26,7 @@ #include <ksqueezedtextlabel.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeuniqueapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> diff --git a/tdeio/tdefile/kcustommenueditor.cpp b/tdeio/tdefile/kcustommenueditor.cpp index fd6eca83d..77f3ebef0 100644 --- a/tdeio/tdefile/kcustommenueditor.cpp +++ b/tdeio/tdefile/kcustommenueditor.cpp @@ -29,7 +29,7 @@ #include <kiconloader.h> #include <tdelistview.h> #include <kservice.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfigbase.h> #include <kopenwith.h> diff --git a/tdeio/tdefile/kicondialog.cpp b/tdeio/tdefile/kicondialog.cpp index a73f34915..8a5de95ee 100644 --- a/tdeio/tdefile/kicondialog.cpp +++ b/tdeio/tdefile/kicondialog.cpp @@ -23,7 +23,7 @@ #include <tdeapplication.h> #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <kprogress.h> #include <kiconview.h> diff --git a/tdeio/tdefile/kimagefilepreview.cpp b/tdeio/tdefile/kimagefilepreview.cpp index 140b2fded..3b6468016 100644 --- a/tdeio/tdefile/kimagefilepreview.cpp +++ b/tdeio/tdefile/kimagefilepreview.cpp @@ -19,7 +19,7 @@ #include <tdeglobal.h> #include <kiconloader.h> #include <kpushbutton.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdelocale.h> #include <tdefiledialog.h> diff --git a/tdeio/tdefile/knotifydialog.cpp b/tdeio/tdefile/knotifydialog.cpp index 24e1227ab..37d748f65 100644 --- a/tdeio/tdefile/knotifydialog.cpp +++ b/tdeio/tdefile/knotifydialog.cpp @@ -33,7 +33,7 @@ #include <tdemessagebox.h> #include <knotifyclient.h> #include <knotifydialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurlrequester.h> #include <tdeio/netaccess.h> diff --git a/tdeio/tdefile/kopenwith.cpp b/tdeio/tdefile/kopenwith.cpp index b1fdbaacc..7524c063b 100644 --- a/tdeio/tdefile/kopenwith.cpp +++ b/tdeio/tdefile/kopenwith.cpp @@ -45,7 +45,7 @@ #include <kiconloader.h> #include <kmimemagic.h> #include <krun.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstringhandler.h> #include <kuserprofile.h> #include <kurlcompletion.h> diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp index aa25ac10f..c8e324a2d 100644 --- a/tdeio/tdefile/kpropertiesdialog.cpp +++ b/tdeio/tdefile/kpropertiesdialog.cpp @@ -99,7 +99,7 @@ extern "C" { #include <tdelocale.h> #include <tdeglobal.h> #include <tdeglobalsettings.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeio/job.h> #include <tdeio/chmodjob.h> #include <tdeio/renamedlg.h> diff --git a/tdeio/tdefile/tdefilebookmarkhandler.cpp b/tdeio/tdefile/tdefilebookmarkhandler.cpp index 1518b48e5..a2147aa30 100644 --- a/tdeio/tdefile/tdefilebookmarkhandler.cpp +++ b/tdeio/tdefile/tdefilebookmarkhandler.cpp @@ -22,7 +22,7 @@ #include <kbookmarkimporter.h> #include <kbookmarkdombuilder.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "tdefiledialog.h" #include "tdefilebookmarkhandler.h" diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp index e1e911400..60c017459 100644 --- a/tdeio/tdefile/tdefiledialog.cpp +++ b/tdeio/tdefile/tdefiledialog.cpp @@ -65,7 +65,7 @@ #include <kpushbutton.h> #include <tderecentdirs.h> #include <kshell.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdguiitem.h> #include <kstaticdeleter.h> #include <tdetoolbar.h> diff --git a/tdeio/tdefile/tdefilesharedlg.cpp b/tdeio/tdefile/tdefilesharedlg.cpp index 9e3770b6c..6e775ebc1 100644 --- a/tdeio/tdefile/tdefilesharedlg.cpp +++ b/tdeio/tdefile/tdefilesharedlg.cpp @@ -29,7 +29,7 @@ #include <tdeprocio.h> #include <tdelocale.h> #include <tdeglobalsettings.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <stdio.h> #include <stdlib.h> diff --git a/tdeio/tdefile/tdefilespeedbar.cpp b/tdeio/tdefile/tdefilespeedbar.cpp index 066953f3a..dfd09ee53 100644 --- a/tdeio/tdefile/tdefilespeedbar.cpp +++ b/tdeio/tdefile/tdefilespeedbar.cpp @@ -29,7 +29,7 @@ #include <tdeglobalsettings.h> #include <tdelocale.h> #include <kprotocolinfo.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurl.h> KFileSpeedBar::KFileSpeedBar( TQWidget *parent, const char *name ) diff --git a/tdeio/tdefile/tdefiletreeview.cpp b/tdeio/tdefile/tdefiletreeview.cpp index e9c87f5b6..928f4a070 100644 --- a/tdeio/tdefile/tdefiletreeview.cpp +++ b/tdeio/tdefile/tdefiletreeview.cpp @@ -26,7 +26,7 @@ #include <tdefileitem.h> #include <tdefileview.h> #include <kmimetype.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <stdlib.h> #include <assert.h> #include <tdeio/job.h> diff --git a/tdeio/tdefile/tdefileview.cpp b/tdeio/tdefile/tdefileview.cpp index aa82344c1..66111595b 100644 --- a/tdeio/tdefile/tdefileview.cpp +++ b/tdeio/tdefile/tdefileview.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "config-tdefile.h" #include "tdefileview.h" diff --git a/tdeio/tdefile/tderecentdirs.cpp b/tdeio/tdefile/tderecentdirs.cpp index ac299978f..dbaf876bd 100644 --- a/tdeio/tdefile/tderecentdirs.cpp +++ b/tdeio/tdefile/tderecentdirs.cpp @@ -27,7 +27,7 @@ */ #include <tderecentdirs.h> #include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobalsettings.h> #define MAX_DIR_HISTORY 3 diff --git a/tdeio/tdefile/tderecentdocument.cpp b/tdeio/tdefile/tderecentdocument.cpp index 84fad4138..8c7205ca1 100644 --- a/tdeio/tdefile/tderecentdocument.cpp +++ b/tdeio/tdefile/tderecentdocument.cpp @@ -27,7 +27,7 @@ */ #include <tderecentdocument.h> #include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <kurl.h> #include <kdebug.h> diff --git a/tdeio/tdeio/authinfo.cpp b/tdeio/tdeio/authinfo.cpp index b95a40585..e8c89e5ff 100644 --- a/tdeio/tdeio/authinfo.cpp +++ b/tdeio/tdeio/authinfo.cpp @@ -30,7 +30,7 @@ #include <tqfile.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ksavefile.h> #include <kstaticdeleter.h> #include <kde_file.h> diff --git a/tdeio/tdeio/defaultprogress.cpp b/tdeio/tdeio/defaultprogress.cpp index 27467875a..653c5a144 100644 --- a/tdeio/tdeio/defaultprogress.cpp +++ b/tdeio/tdeio/defaultprogress.cpp @@ -31,7 +31,7 @@ #include <kiconloader.h> #include <tdeprocess.h> #include <kpushbutton.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdguiitem.h> #include <klineedit.h> diff --git a/tdeio/tdeio/kdatatool.cpp b/tdeio/tdeio/kdatatool.cpp index 8d67808df..903bf7775 100644 --- a/tdeio/tdeio/kdatatool.cpp +++ b/tdeio/tdeio/kdatatool.cpp @@ -20,7 +20,7 @@ #include "kdatatool.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <klibloader.h> #include <kdebug.h> #include <kinstance.h> diff --git a/tdeio/tdeio/kimageio.cpp b/tdeio/tdeio/kimageio.cpp index d3768d297..c5835e251 100644 --- a/tdeio/tdeio/kimageio.cpp +++ b/tdeio/tdeio/kimageio.cpp @@ -12,7 +12,7 @@ #include <tqdir.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqstring.h> #include <tqregexp.h> #include <tqvaluelist.h> diff --git a/tdeio/tdeio/kmimemagic.cpp b/tdeio/tdeio/kmimemagic.cpp index 42f4d676c..a511324c0 100644 --- a/tdeio/tdeio/kmimemagic.cpp +++ b/tdeio/tdeio/kmimemagic.cpp @@ -26,7 +26,7 @@ #include <tdeapplication.h> #include <tqfile.h> #include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstaticdeleter.h> #include <klargefile.h> #include <assert.h> diff --git a/tdeio/tdeio/kmimetype.cpp b/tdeio/tdeio/kmimetype.cpp index 0555e2285..3be10a07c 100644 --- a/tdeio/tdeio/kmimetype.cpp +++ b/tdeio/tdeio/kmimetype.cpp @@ -54,7 +54,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurl.h> #include <tdesycoca.h> #include <kde_file.h> diff --git a/tdeio/tdeio/krun.cpp b/tdeio/tdeio/krun.cpp index 3dda0cc19..b28820444 100644 --- a/tdeio/tdeio/krun.cpp +++ b/tdeio/tdeio/krun.cpp @@ -46,7 +46,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <kprotocolinfo.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeprocess.h> #include <dcopclient.h> #include <tqfile.h> diff --git a/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp index c69c982fb..34cd7816e 100644 --- a/tdeio/tdeio/kservice.cpp +++ b/tdeio/tdeio/kservice.cpp @@ -45,7 +45,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <tdeconfigbase.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <dcopclient.h> #include "kservicefactory.h" diff --git a/tdeio/tdeio/kservicefactory.cpp b/tdeio/tdeio/kservicefactory.cpp index abd6ec61e..346088bbb 100644 --- a/tdeio/tdeio/kservicefactory.cpp +++ b/tdeio/tdeio/kservicefactory.cpp @@ -27,7 +27,7 @@ #include <tdelocale.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstaticdeleter.h> KServiceFactory::KServiceFactory() diff --git a/tdeio/tdeio/kservicegroup.cpp b/tdeio/tdeio/kservicegroup.cpp index e0ec1321e..fb86c35fa 100644 --- a/tdeio/tdeio/kservicegroup.cpp +++ b/tdeio/tdeio/kservicegroup.cpp @@ -20,7 +20,7 @@ #include <kiconloader.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kdebug.h> #include <ksortablevaluelist.h> diff --git a/tdeio/tdeio/kservicegroupfactory.cpp b/tdeio/tdeio/kservicegroupfactory.cpp index 3caf9c027..077ed800b 100644 --- a/tdeio/tdeio/kservicegroupfactory.cpp +++ b/tdeio/tdeio/kservicegroupfactory.cpp @@ -27,7 +27,7 @@ #include <tdelocale.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> KServiceGroupFactory::KServiceGroupFactory() : KSycocaFactory( KST_KServiceGroupFactory ) diff --git a/tdeio/tdeio/ktar.cpp b/tdeio/tdeio/ktar.cpp index 74b47e69b..6d90954b4 100644 --- a/tdeio/tdeio/ktar.cpp +++ b/tdeio/tdeio/ktar.cpp @@ -36,7 +36,7 @@ #include <kfilterbase.h> #include "ktar.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> //////////////////////////////////////////////////////////////////////// /////////////////////////// KTar /////////////////////////////////// diff --git a/tdeio/tdeio/ktrader.cpp b/tdeio/tdeio/ktrader.cpp index 7ef39638e..6e01d2bcf 100644 --- a/tdeio/tdeio/ktrader.cpp +++ b/tdeio/tdeio/ktrader.cpp @@ -23,7 +23,7 @@ #include <tqbuffer.h> #include <kuserprofile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstaticdeleter.h> #include <kdebug.h> diff --git a/tdeio/tdeio/passdlg.cpp b/tdeio/tdeio/passdlg.cpp index 63c13ff22..112244d80 100644 --- a/tdeio/tdeio/passdlg.cpp +++ b/tdeio/tdeio/passdlg.cpp @@ -31,7 +31,7 @@ #include <kiconloader.h> #include <klineedit.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> using namespace TDEIO; diff --git a/tdeio/tdeio/previewjob.cpp b/tdeio/tdeio/previewjob.cpp index d1820a69e..b4e9396ef 100644 --- a/tdeio/tdeio/previewjob.cpp +++ b/tdeio/tdeio/previewjob.cpp @@ -45,7 +45,7 @@ #include <ktrader.h> #include <kmdcodec.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeio/kservice.h> diff --git a/tdeio/tdeio/sessiondata.cpp b/tdeio/tdeio/sessiondata.cpp index 9c6b33b0a..d16137cad 100644 --- a/tdeio/tdeio/sessiondata.cpp +++ b/tdeio/tdeio/sessiondata.cpp @@ -28,7 +28,7 @@ #include <kcharsets.h> #include <dcopclient.h> #include <tdeprotocolmanager.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdesu/client.h> #include <tdeio/slaveconfig.h> diff --git a/tdeio/tdeio/slave.cpp b/tdeio/tdeio/slave.cpp index 915c4fa55..0954d3932 100644 --- a/tdeio/tdeio/slave.cpp +++ b/tdeio/tdeio/slave.cpp @@ -37,7 +37,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdetempfile.h> #include <ksock.h> diff --git a/tdeio/tdeio/tdefileshare.cpp b/tdeio/tdeio/tdefileshare.cpp index 584d4e5e2..84280ddcd 100644 --- a/tdeio/tdeio/tdefileshare.cpp +++ b/tdeio/tdeio/tdefileshare.cpp @@ -25,7 +25,7 @@ #include <tdeprocio.h> #include <tdelocale.h> #include <kstaticdeleter.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <kdirwatch.h> #include <stdio.h> diff --git a/tdeio/tdeio/tdeprotocolmanager.cpp b/tdeio/tdeio/tdeprotocolmanager.cpp index 6f64fe922..492b83401 100644 --- a/tdeio/tdeio/tdeprotocolmanager.cpp +++ b/tdeio/tdeio/tdeprotocolmanager.cpp @@ -26,7 +26,7 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <klibloader.h> #include <kstringhandler.h> #include <kstaticdeleter.h> diff --git a/tdeio/tdeioexec/main.cpp b/tdeio/tdeioexec/main.cpp index 6905907c2..d3515b9bc 100644 --- a/tdeio/tdeioexec/main.cpp +++ b/tdeio/tdeioexec/main.cpp @@ -27,7 +27,7 @@ #include <tqfile.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdemessagebox.h> #include <tdeio/job.h> diff --git a/tdeio/tests/kdcopcheck.cpp b/tdeio/tests/kdcopcheck.cpp index 632960031..0b5692f59 100644 --- a/tdeio/tests/kdcopcheck.cpp +++ b/tdeio/tests/kdcopcheck.cpp @@ -3,7 +3,7 @@ #include <kservice.h> #include <kmimetype.h> #include <assert.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kservicegroup.h> #include <kimageio.h> #include <kprotocolinfo.h> diff --git a/tdeio/tests/kurifiltertest.cpp b/tdeio/tests/kurifiltertest.cpp index 0b3e6621d..57732e6c6 100644 --- a/tdeio/tests/kurifiltertest.cpp +++ b/tdeio/tests/kurifiltertest.cpp @@ -26,7 +26,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdecmdlineargs.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ksimpleconfig.h> #include <tqdir.h> diff --git a/tdeio/tests/tdesycocatest.cpp b/tdeio/tests/tdesycocatest.cpp index 9747f2d0f..035c4593f 100644 --- a/tdeio/tests/tdesycocatest.cpp +++ b/tdeio/tests/tdesycocatest.cpp @@ -22,7 +22,7 @@ #include <kservice.h> #include <kmimetype.h> #include <assert.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kservicegroup.h> #include <kimageio.h> #include <kprotocolinfo.h> diff --git a/tdeioslave/file/file.cpp b/tdeioslave/file/file.cpp index 7559ca773..d404b8ab4 100644 --- a/tdeioslave/file/file.cpp +++ b/tdeioslave/file/file.cpp @@ -83,14 +83,13 @@ #include <limits.h> #include <tdeprocess.h> #include <kmountpoint.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #ifdef HAVE_VOLMGT #include <volmgt.h> #include <sys/mnttab.h> #endif -#include <kstandarddirs.h> #include <tdeio/ioslave_defaults.h> #include <klargefile.h> #include <tdeglobal.h> diff --git a/tdeioslave/http/http.cpp b/tdeioslave/http/http.cpp index 7d9fd72dc..5cc638bd0 100644 --- a/tdeioslave/http/http.cpp +++ b/tdeioslave/http/http.cpp @@ -63,7 +63,7 @@ #include <dcopclient.h> #include <kdatastream.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstringhandler.h> #include <kremoteencoding.h> diff --git a/tdeioslave/http/http_cache_cleaner.cpp b/tdeioslave/http/http_cache_cleaner.cpp index 3ea4b6fe2..08ca740b2 100644 --- a/tdeioslave/http/http_cache_cleaner.cpp +++ b/tdeioslave/http/http_cache_cleaner.cpp @@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <dcopclient.h> #include <tdeprotocolmanager.h> diff --git a/tdeioslave/http/kcookiejar/kcookieserver.cpp b/tdeioslave/http/kcookiejar/kcookieserver.cpp index 738b64eba..372d4281a 100644 --- a/tdeioslave/http/kcookiejar/kcookieserver.cpp +++ b/tdeioslave/http/kcookiejar/kcookieserver.cpp @@ -39,7 +39,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kdebug.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "kcookiejar.h" #include "kcookiewin.h" diff --git a/tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp b/tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp index 9d720d6c4..29c808abb 100644 --- a/tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp +++ b/tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp @@ -27,7 +27,7 @@ #include <tdeapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "../kcookiejar.cpp" diff --git a/tdelfeditor/tdelfeditor.cpp b/tdelfeditor/tdelfeditor.cpp index 8f4317cc3..611b71c8c 100644 --- a/tdelfeditor/tdelfeditor.cpp +++ b/tdelfeditor/tdelfeditor.cpp @@ -48,7 +48,7 @@ extern "C" { #include <tdecmdlineargs.h> #include <kiconloader.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> /* return application name */ extern const char *__progname; diff --git a/tdemarkdown/markdown_part.cpp b/tdemarkdown/markdown_part.cpp index 255ed7280..a77df6d88 100644 --- a/tdemarkdown/markdown_part.cpp +++ b/tdemarkdown/markdown_part.cpp @@ -13,7 +13,7 @@ #include <tqfile.h> #include <tdeparts/genericfactory.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdehtmlview.h> diff --git a/tdenewstuff/engine.cpp b/tdenewstuff/engine.cpp index 4e8ad57f4..5f54af9bd 100644 --- a/tdenewstuff/engine.cpp +++ b/tdenewstuff/engine.cpp @@ -28,7 +28,7 @@ #include <tdeio/job.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "knewstuff.h" #include "downloaddialog.h" diff --git a/tdenewstuff/knewstuff.cpp b/tdenewstuff/knewstuff.cpp index 3fb2b72ce..fe3358698 100644 --- a/tdenewstuff/knewstuff.cpp +++ b/tdenewstuff/knewstuff.cpp @@ -22,7 +22,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "engine.h" diff --git a/tdenewstuff/knewstuffgeneric.cpp b/tdenewstuff/knewstuffgeneric.cpp index 0480b1983..2bc7ac788 100644 --- a/tdenewstuff/knewstuffgeneric.cpp +++ b/tdenewstuff/knewstuffgeneric.cpp @@ -27,7 +27,7 @@ #include <tdelocale.h> #include <tdeprocess.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <kmimemagic.h> #include <ktar.h> diff --git a/tdenewstuff/knewstuffsecure.cpp b/tdenewstuff/knewstuffsecure.cpp index d2c81ae35..27e7f2989 100644 --- a/tdenewstuff/knewstuffsecure.cpp +++ b/tdenewstuff/knewstuffsecure.cpp @@ -22,7 +22,7 @@ #include <tdeio/netaccess.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ktar.h> #include <ktempdir.h> diff --git a/tdeparts/browserrun.cpp b/tdeparts/browserrun.cpp index bf96f6c7b..ab3a4c384 100644 --- a/tdeparts/browserrun.cpp +++ b/tdeparts/browserrun.cpp @@ -27,7 +27,7 @@ #include <kuserprofile.h> #include <tdetempfile.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <assert.h> using namespace KParts; diff --git a/tdeparts/dockmainwindow.cpp b/tdeparts/dockmainwindow.cpp index e7ce785ac..7a1bd5703 100644 --- a/tdeparts/dockmainwindow.cpp +++ b/tdeparts/dockmainwindow.cpp @@ -27,7 +27,7 @@ #include <kstatusbar.h> #include <kinstance.h> #include <khelpmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqapplication.h> #include <kdebug.h> diff --git a/tdeparts/mainwindow.cpp b/tdeparts/mainwindow.cpp index 26adbd838..2e6d2b7c3 100644 --- a/tdeparts/mainwindow.cpp +++ b/tdeparts/mainwindow.cpp @@ -25,7 +25,7 @@ #include <kinstance.h> #include <kstatusbar.h> #include <khelpmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqapplication.h> #include <kxmlguifactory.h> diff --git a/tdeparts/part.cpp b/tdeparts/part.cpp index b65106ea7..9a558ee01 100644 --- a/tdeparts/part.cpp +++ b/tdeparts/part.cpp @@ -37,7 +37,7 @@ #include <tdetempfile.h> #include <tdemessagebox.h> #include <tdeio/job.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdefiledialog.h> #include <kdirnotify_stub.h> diff --git a/tdeparts/plugin.cpp b/tdeparts/plugin.cpp index 196a4a78c..5225de500 100644 --- a/tdeparts/plugin.cpp +++ b/tdeparts/plugin.cpp @@ -31,7 +31,7 @@ #include <klibloader.h> #include <kinstance.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <kxmlguifactory.h> #include <tdelocale.h> diff --git a/tdeparts/tests/example.cpp b/tdeparts/tests/example.cpp index e44e4c2e2..319c970a8 100644 --- a/tdeparts/tests/example.cpp +++ b/tdeparts/tests/example.cpp @@ -8,7 +8,7 @@ #include <tqdir.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdemessagebox.h> #include <tdeaction.h> diff --git a/tdeparts/tests/ghostview.cpp b/tdeparts/tests/ghostview.cpp index 723343303..e955a5463 100644 --- a/tdeparts/tests/ghostview.cpp +++ b/tdeparts/tests/ghostview.cpp @@ -1,5 +1,5 @@ #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdeaction.h> #include <tdelocale.h> diff --git a/tdeparts/tests/normalktm.cpp b/tdeparts/tests/normalktm.cpp index eae4e80af..0ecabbfca 100644 --- a/tdeparts/tests/normalktm.cpp +++ b/tdeparts/tests/normalktm.cpp @@ -8,7 +8,7 @@ #include <tqdir.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdemessagebox.h> #include <tdeaction.h> diff --git a/tdeparts/tests/notepad.cpp b/tdeparts/tests/notepad.cpp index 9ab7b7d69..84de3ac1d 100644 --- a/tdeparts/tests/notepad.cpp +++ b/tdeparts/tests/notepad.cpp @@ -14,7 +14,7 @@ #include <tdeaction.h> #include <tdelocale.h> #include <kstatusbar.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> NotepadPart::NotepadPart( TQWidget* parentWidget, const char*, TQObject* parent, const char* name, diff --git a/tdeprint/cups/cupsdconf2/cupsdcomment.cpp b/tdeprint/cups/cupsdconf2/cupsdcomment.cpp index 8a788cad3..206c93e37 100644 --- a/tdeprint/cups/cupsdconf2/cupsdcomment.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdcomment.cpp @@ -22,7 +22,7 @@ #include <tqfile.h> #include <tqregexp.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> TQString Comment::comment() { diff --git a/tdeprint/cups/cupsdconf2/cupsdsplash.cpp b/tdeprint/cups/cupsdconf2/cupsdsplash.cpp index 52db651d3..cb952ed4b 100644 --- a/tdeprint/cups/cupsdconf2/cupsdsplash.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdsplash.cpp @@ -23,7 +23,7 @@ #include <tqpixmap.h> #include <tqlayout.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> CupsdSplash::CupsdSplash(TQWidget *parent, const char *name) : CupsdPage(parent, name) diff --git a/tdeprint/cups/imageposition.cpp b/tdeprint/cups/imageposition.cpp index 436af9ac4..851738c42 100644 --- a/tdeprint/cups/imageposition.cpp +++ b/tdeprint/cups/imageposition.cpp @@ -20,7 +20,7 @@ #include "imageposition.h" #include <tqpainter.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> static void draw3DPage(TQPainter *p, TQRect r) { diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp index 3a0c711bd..8dffc7125 100644 --- a/tdeprint/cups/kmcupsmanager.cpp +++ b/tdeprint/cups/kmcupsmanager.cpp @@ -44,7 +44,7 @@ #include <tdeapplication.h> #include <tdelocale.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdesocketbase.h> #include <klibloader.h> #include <tdemessagebox.h> diff --git a/tdeprint/cups/kpimagepage.cpp b/tdeprint/cups/kpimagepage.cpp index 0c6eb4770..86acb1e8a 100644 --- a/tdeprint/cups/kpimagepage.cpp +++ b/tdeprint/cups/kpimagepage.cpp @@ -35,7 +35,7 @@ #include <tdelocale.h> #include <knuminput.h> #include <kseparator.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) : KPrintDialogPage(parent, name) diff --git a/tdeprint/ext/kextprinterimpl.cpp b/tdeprint/ext/kextprinterimpl.cpp index 7923ea729..e3443677e 100644 --- a/tdeprint/ext/kextprinterimpl.cpp +++ b/tdeprint/ext/kextprinterimpl.cpp @@ -21,7 +21,7 @@ #include "kprinter.h" #include <tqfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdelocale.h> diff --git a/tdeprint/foomatic/kfoomaticprinterimpl.cpp b/tdeprint/foomatic/kfoomaticprinterimpl.cpp index df3949903..1e1c4c20b 100644 --- a/tdeprint/foomatic/kfoomaticprinterimpl.cpp +++ b/tdeprint/foomatic/kfoomaticprinterimpl.cpp @@ -20,7 +20,7 @@ #include "kfoomaticprinterimpl.h" #include "kprinter.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> KFoomaticPrinterImpl::KFoomaticPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/) diff --git a/tdeprint/kmfactory.cpp b/tdeprint/kmfactory.cpp index 216d4c14b..d63ca2872 100644 --- a/tdeprint/kmfactory.cpp +++ b/tdeprint/kmfactory.cpp @@ -33,7 +33,7 @@ #include <klibloader.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <kdebug.h> #include <tdemessagebox.h> diff --git a/tdeprint/kmmanager.cpp b/tdeprint/kmmanager.cpp index 3393edc58..eed2c53ec 100644 --- a/tdeprint/kmmanager.cpp +++ b/tdeprint/kmmanager.cpp @@ -28,7 +28,7 @@ #include <zlib.h> #include <tqfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdelocale.h> #include <kdebug.h> diff --git a/tdeprint/kmspecialmanager.cpp b/tdeprint/kmspecialmanager.cpp index 84da26fe9..f664ab66c 100644 --- a/tdeprint/kmspecialmanager.cpp +++ b/tdeprint/kmspecialmanager.cpp @@ -25,7 +25,7 @@ #include "driver.h" #include <tqfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <ksimpleconfig.h> #include <tdelocale.h> diff --git a/tdeprint/kmthreadjob.cpp b/tdeprint/kmthreadjob.cpp index 5759664c8..f41a5551d 100644 --- a/tdeprint/kmthreadjob.cpp +++ b/tdeprint/kmthreadjob.cpp @@ -24,7 +24,7 @@ #include <tqfile.h> #include <tqtextstream.h> #include <tqstringlist.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <errno.h> #include <sys/types.h> diff --git a/tdeprint/kmvirtualmanager.cpp b/tdeprint/kmvirtualmanager.cpp index 4bf58b3c1..46b7fd46f 100644 --- a/tdeprint/kmvirtualmanager.cpp +++ b/tdeprint/kmvirtualmanager.cpp @@ -29,7 +29,7 @@ #include <tqdir.h> #include <tqfileinfo.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurl.h> #include <kdebug.h> #include <tdemessagebox.h> diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp index 518a0a903..c3f74316e 100644 --- a/tdeprint/kprinter.cpp +++ b/tdeprint/kprinter.cpp @@ -34,7 +34,7 @@ #include <tqdir.h> #include <tqguardedptr.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeconfig.h> #include <krun.h> diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp index 2318a09a0..f833e9464 100644 --- a/tdeprint/kprinterimpl.cpp +++ b/tdeprint/kprinterimpl.cpp @@ -35,7 +35,7 @@ #include <tdelocale.h> #include <dcopclient.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdatastream.h> #include <kdebug.h> #include <kmimemagic.h> diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp index abd41c213..c9316bad9 100644 --- a/tdeprint/kprintpreview.cpp +++ b/tdeprint/kprintpreview.cpp @@ -33,7 +33,7 @@ #include <kuserprofile.h> #include <krun.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <tdemessagebox.h> #include <kdebug.h> diff --git a/tdeprint/kxmlcommand.cpp b/tdeprint/kxmlcommand.cpp index 82731d69f..d9f3fc456 100644 --- a/tdeprint/kxmlcommand.cpp +++ b/tdeprint/kxmlcommand.cpp @@ -29,7 +29,7 @@ #include <tqinputdialog.h> #include <tqmap.h> #include <tqvaluelist.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <ksimpleconfig.h> #include <kdialogbase.h> diff --git a/tdeprint/lpd/klpdprinterimpl.cpp b/tdeprint/lpd/klpdprinterimpl.cpp index 843e73409..5caecda55 100644 --- a/tdeprint/lpd/klpdprinterimpl.cpp +++ b/tdeprint/lpd/klpdprinterimpl.cpp @@ -21,7 +21,7 @@ #include "kprinter.h" #include <tqfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> KLpdPrinterImpl::KLpdPrinterImpl(TQObject *parent, const char *name) diff --git a/tdeprint/lpd/kmlpdmanager.cpp b/tdeprint/lpd/kmlpdmanager.cpp index 0157515ec..affe4051d 100644 --- a/tdeprint/lpd/kmlpdmanager.cpp +++ b/tdeprint/lpd/kmlpdmanager.cpp @@ -33,7 +33,7 @@ #include <tqregexp.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdeprocess.h> diff --git a/tdeprint/lpdunix/klpdunixprinterimpl.cpp b/tdeprint/lpdunix/klpdunixprinterimpl.cpp index fe6a6aa7b..e636f94cf 100644 --- a/tdeprint/lpdunix/klpdunixprinterimpl.cpp +++ b/tdeprint/lpdunix/klpdunixprinterimpl.cpp @@ -21,7 +21,7 @@ #include "kprinter.h" #include <tqfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kmacroexpander.h> diff --git a/tdeprint/lpdunix/kmlpdunixmanager.cpp b/tdeprint/lpdunix/kmlpdunixmanager.cpp index fa20b17da..6d7e5e9ab 100644 --- a/tdeprint/lpdunix/kmlpdunixmanager.cpp +++ b/tdeprint/lpdunix/kmlpdunixmanager.cpp @@ -27,7 +27,7 @@ #include <tqtextstream.h> #include <tqregexp.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <stdlib.h> diff --git a/tdeprint/lpr/apshandler.cpp b/tdeprint/lpr/apshandler.cpp index acb0e0c2d..dd4c3a72e 100644 --- a/tdeprint/lpr/apshandler.cpp +++ b/tdeprint/lpr/apshandler.cpp @@ -30,7 +30,7 @@ #include <tqdir.h> #include <tqtextstream.h> #include <tqvaluestack.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kdebug.h> diff --git a/tdeprint/lpr/klprprinterimpl.cpp b/tdeprint/lpr/klprprinterimpl.cpp index 03a75001a..3de216f22 100644 --- a/tdeprint/lpr/klprprinterimpl.cpp +++ b/tdeprint/lpr/klprprinterimpl.cpp @@ -21,7 +21,7 @@ #include "kprinter.h" #include "kmlprmanager.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqfile.h> #include <stdlib.h> diff --git a/tdeprint/lpr/kmlprmanager.cpp b/tdeprint/lpr/kmlprmanager.cpp index 6547f2532..da6a571e3 100644 --- a/tdeprint/lpr/kmlprmanager.cpp +++ b/tdeprint/lpr/kmlprmanager.cpp @@ -31,7 +31,7 @@ #include <tqfileinfo.h> #include <tqptrlist.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <kprinter.h> #include <tdeprocess.h> diff --git a/tdeprint/lpr/lpchelper.cpp b/tdeprint/lpr/lpchelper.cpp index 0e9be16ac..64e78397a 100644 --- a/tdeprint/lpr/lpchelper.cpp +++ b/tdeprint/lpr/lpchelper.cpp @@ -22,7 +22,7 @@ #include "kmjob.h" #include "lprsettings.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqtextstream.h> #include <tqregexp.h> #include <kdebug.h> diff --git a/tdeprint/lpr/lpqhelper.cpp b/tdeprint/lpr/lpqhelper.cpp index 051407ac2..aca879833 100644 --- a/tdeprint/lpr/lpqhelper.cpp +++ b/tdeprint/lpr/lpqhelper.cpp @@ -22,7 +22,7 @@ #include "kpipeprocess.h" #include "lprsettings.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeprocess.h> #include <kdebug.h> diff --git a/tdeprint/lpr/lprngtoolhandler.cpp b/tdeprint/lpr/lprngtoolhandler.cpp index 960f5adb8..5732b6808 100644 --- a/tdeprint/lpr/lprngtoolhandler.cpp +++ b/tdeprint/lpr/lprngtoolhandler.cpp @@ -30,7 +30,7 @@ #include <tqtextstream.h> #include <tdelocale.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> LPRngToolHandler::LPRngToolHandler(KMManager *mgr) : LprHandler("lprngtool", mgr) diff --git a/tdeprint/lpr/matichandler.cpp b/tdeprint/lpr/matichandler.cpp index aae4bbe03..74c3c62c6 100644 --- a/tdeprint/lpr/matichandler.cpp +++ b/tdeprint/lpr/matichandler.cpp @@ -30,7 +30,7 @@ #include "foomatic2loader.h" #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <kdebug.h> #include <tdeprocess.h> diff --git a/tdeprint/management/kmdbcreator.cpp b/tdeprint/management/kmdbcreator.cpp index 50020aec9..3d0fa8638 100644 --- a/tdeprint/management/kmdbcreator.cpp +++ b/tdeprint/management/kmdbcreator.cpp @@ -26,7 +26,7 @@ #include <tqdir.h> #include <tdelocale.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> KMDBCreator::KMDBCreator(TQObject *parent, const char *name) diff --git a/tdeprint/management/kmdriverdb.cpp b/tdeprint/management/kmdriverdb.cpp index 11c717ff4..5234dd6d6 100644 --- a/tdeprint/management/kmdriverdb.cpp +++ b/tdeprint/management/kmdriverdb.cpp @@ -27,7 +27,7 @@ #include <tqfile.h> #include <tqtextstream.h> #include <tqfileinfo.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdemessagebox.h> diff --git a/tdeprint/management/kminstancepage.cpp b/tdeprint/management/kminstancepage.cpp index 411f86325..57e5cb445 100644 --- a/tdeprint/management/kminstancepage.cpp +++ b/tdeprint/management/kminstancepage.cpp @@ -35,7 +35,7 @@ #include <tdelistbox.h> #include <tdelocale.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> KMInstancePage::KMInstancePage(TQWidget *parent, const char *name) diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp index bcad038a4..744ed73dd 100644 --- a/tdeprint/management/kmmainview.cpp +++ b/tdeprint/management/kmmainview.cpp @@ -53,7 +53,7 @@ #include <klibloader.h> #include <kdialogbase.h> #include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdeprocess.h> diff --git a/tdeprint/management/sidepixmap.cpp b/tdeprint/management/sidepixmap.cpp index a0be8f8b8..f047b7c11 100644 --- a/tdeprint/management/sidepixmap.cpp +++ b/tdeprint/management/sidepixmap.cpp @@ -20,7 +20,7 @@ #include "sidepixmap.h" #include <tqpainter.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> SidePixmap::SidePixmap(TQWidget *parent, const char *name) : TQFrame(parent, name) diff --git a/tdeprint/rlpr/kmrlprmanager.cpp b/tdeprint/rlpr/kmrlprmanager.cpp index 7b8ceac2d..1b7fbdc2e 100644 --- a/tdeprint/rlpr/kmrlprmanager.cpp +++ b/tdeprint/rlpr/kmrlprmanager.cpp @@ -25,7 +25,7 @@ #include <tqtextstream.h> #include <tqmap.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> KMRlprManager::KMRlprManager(TQObject *parent, const char *name, const TQStringList & /*args*/) diff --git a/tdeprint/rlpr/krlprprinterimpl.cpp b/tdeprint/rlpr/krlprprinterimpl.cpp index 09653930c..e844367fe 100644 --- a/tdeprint/rlpr/krlprprinterimpl.cpp +++ b/tdeprint/rlpr/krlprprinterimpl.cpp @@ -24,7 +24,7 @@ #include "kmprinter.h" #include <tqfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdelocale.h> diff --git a/tdeprint/tdeprintcheck.cpp b/tdeprint/tdeprintcheck.cpp index 36cc935ec..25ab20f5c 100644 --- a/tdeprint/tdeprintcheck.cpp +++ b/tdeprint/tdeprintcheck.cpp @@ -38,7 +38,7 @@ #include "tdeprintcheck.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <kextsock.h> #include <tqfile.h> diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp index fee09c62e..c425bfe6a 100644 --- a/tdeprint/tdeprintd.cpp +++ b/tdeprint/tdeprintd.cpp @@ -31,7 +31,7 @@ #include <tqlabel.h> #include <kpushbutton.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <twin.h> #include <tdeapplication.h> #include <tqlayout.h> diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp index 8d51332e4..232d10740 100644 --- a/tdeprint/tools/escputil/escpwidget.cpp +++ b/tdeprint/tools/escputil/escpwidget.cpp @@ -27,7 +27,7 @@ #include <tdemacros.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <kdialogbase.h> #include <klibloader.h> diff --git a/tderesources/configpage.cpp b/tderesources/configpage.cpp index 8b1443168..f857fdd95 100644 --- a/tderesources/configpage.cpp +++ b/tderesources/configpage.cpp @@ -31,7 +31,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurlrequester.h> #include <tdelistview.h> #include <kbuttonbox.h> diff --git a/tderesources/factory.cpp b/tderesources/factory.cpp index bb6c31a53..a39a4574a 100644 --- a/tderesources/factory.cpp +++ b/tderesources/factory.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstaticdeleter.h> #include <tqfile.h> diff --git a/tderesources/managerimpl.cpp b/tderesources/managerimpl.cpp index e08c0bd87..f5fdc74f4 100644 --- a/tderesources/managerimpl.cpp +++ b/tderesources/managerimpl.cpp @@ -27,7 +27,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "resource.h" #include "factory.h" diff --git a/tdersync/rsyncconfigdialog.cpp b/tdersync/rsyncconfigdialog.cpp index e34053f55..a99a245c7 100644 --- a/tdersync/rsyncconfigdialog.cpp +++ b/tdersync/rsyncconfigdialog.cpp @@ -86,7 +86,7 @@ #include <tdeconfigdialog.h> #include <kdirlister.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelistviewsearchline.h> #include <kiconviewsearchline.h> #include <kstaticdeleter.h> diff --git a/tdersync/tdersync.h b/tdersync/tdersync.h index d6ea4d916..a3a6ced31 100644 --- a/tdersync/tdersync.h +++ b/tdersync/tdersync.h @@ -65,7 +65,7 @@ #include <tdeconfigdialog.h> #include <kdirlister.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelistviewsearchline.h> #include <kiconviewsearchline.h> #include <kstaticdeleter.h> diff --git a/tdestyles/kthemestyle/tdestyledirs.cpp b/tdestyles/kthemestyle/tdestyledirs.cpp index 9f795e1e2..bcb208601 100644 --- a/tdestyles/kthemestyle/tdestyledirs.cpp +++ b/tdestyles/kthemestyle/tdestyledirs.cpp @@ -22,7 +22,7 @@ */ #include <tqfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "tdestyledirs.h" TDEStyleDirs* TDEStyleDirs::instance = 0; diff --git a/tdestyles/kthemestyle/tdestyledirs.h b/tdestyles/kthemestyle/tdestyledirs.h index 2a42fd2ba..b70315c84 100644 --- a/tdestyles/kthemestyle/tdestyledirs.h +++ b/tdestyles/kthemestyle/tdestyledirs.h @@ -25,7 +25,7 @@ #include <tqsettings.h> #include <tqstringlist.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> /** * @short Access to the standard KDE directories for the pixmap style diff --git a/tdestyles/utils/installtheme/main.cpp b/tdestyles/utils/installtheme/main.cpp index d73a8c7d6..aa81b7254 100644 --- a/tdestyles/utils/installtheme/main.cpp +++ b/tdestyles/utils/installtheme/main.cpp @@ -30,7 +30,7 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> static const char desc[] = I18N_NOOP("TDE Tool to build a cache list of all pixmap themes installed"); static const char ver[] = "0.9.1"; diff --git a/tdesu/client.cpp b/tdesu/client.cpp index 3ccb30c65..54ba1dc00 100644 --- a/tdesu/client.cpp +++ b/tdesu/client.cpp @@ -34,7 +34,7 @@ #include <tqregexp.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <kde_file.h> diff --git a/tdesu/process.cpp b/tdesu/process.cpp index 1d56128da..3cbea8ec6 100644 --- a/tdesu/process.cpp +++ b/tdesu/process.cpp @@ -50,7 +50,7 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "process.h" #include "tdesu_pty.h" diff --git a/tdesu/ssh.cpp b/tdesu/ssh.cpp index e75f33d69..1f543579c 100644 --- a/tdesu/ssh.cpp +++ b/tdesu/ssh.cpp @@ -33,7 +33,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "ssh.h" #include "kcookie.h" diff --git a/tdesu/su.cpp b/tdesu/su.cpp index 778d99da0..b46d0ae0b 100644 --- a/tdesu/su.cpp +++ b/tdesu/su.cpp @@ -36,7 +36,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "su.h" #include "kcookie.h" diff --git a/tdesu/tdesu_pty.cpp b/tdesu/tdesu_pty.cpp index 8559512af..c4139dd35 100644 --- a/tdesu/tdesu_pty.cpp +++ b/tdesu/tdesu_pty.cpp @@ -41,7 +41,7 @@ #include <tqcstring.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "tdesu_pty.h" // stdlib.h is meant to declare the prototypes but doesn't :( diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp index 8cc107834..a99f44020 100644 --- a/tdeui/kbugreport.cpp +++ b/tdeui/kbugreport.cpp @@ -34,7 +34,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <tdeprocess.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdguiitem.h> #include <kurl.h> #include <kurllabel.h> diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp index 0d594c8f4..04bc15016 100644 --- a/tdeui/kedittoolbar.cpp +++ b/tdeui/kedittoolbar.cpp @@ -31,7 +31,7 @@ #include <tqtextstream.h> #include <tdeaction.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kicontheme.h> #include <kiconloader.h> diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp index ac7eb4cf5..ac2e72601 100644 --- a/tdeui/khelpmenu.cpp +++ b/tdeui/khelpmenu.cpp @@ -41,7 +41,7 @@ #include <tdepopupmenu.h> #include <tdestdaccel.h> #include <kstdaction.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "kswitchlanguagedialog.h" diff --git a/tdeui/kkeybutton.cpp b/tdeui/kkeybutton.cpp index 201ade557..260cba34b 100644 --- a/tdeui/kkeybutton.cpp +++ b/tdeui/kkeybutton.cpp @@ -26,7 +26,7 @@ #include <tqpainter.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <tdelocale.h> #include "config.h" diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp index 15c8ef78e..5c028e4f7 100644 --- a/tdeui/kkeydialog.cpp +++ b/tdeui/kkeydialog.cpp @@ -43,7 +43,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <kiconloader.h> #include <tdelistviewsearchline.h> #include <tdelocale.h> diff --git a/tdeui/kpassdlg.cpp b/tdeui/kpassdlg.cpp index c34801777..e9532137f 100644 --- a/tdeui/kpassdlg.cpp +++ b/tdeui/kpassdlg.cpp @@ -41,7 +41,7 @@ #include <tdemessagebox.h> #include <tdeaboutdialog.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kprogress.h> #include <sys/time.h> diff --git a/tdeui/ktimezonewidget.cpp b/tdeui/ktimezonewidget.cpp index f6488847f..7fcfe091c 100644 --- a/tdeui/ktimezonewidget.cpp +++ b/tdeui/ktimezonewidget.cpp @@ -22,7 +22,7 @@ #include <tdefile.h> #include <tdelistview.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ktimezones.h> #include <ktimezonewidget.h> #include <tqpixmap.h> diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp index f9202bd30..7152e18bb 100644 --- a/tdeui/ktip.cpp +++ b/tdeui/ktip.cpp @@ -42,7 +42,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tdelocale.h> #include <kpushbutton.h> #include <kseparator.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdguiitem.h> #include <ktextbrowser.h> #include <kiconeffect.h> diff --git a/tdeui/kxmlguiclient.cpp b/tdeui/kxmlguiclient.cpp index e52cc31bc..7b2657376 100644 --- a/tdeui/kxmlguiclient.cpp +++ b/tdeui/kxmlguiclient.cpp @@ -29,7 +29,7 @@ #include <tqguardedptr.h> #include <kinstance.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdeaction.h> #include <tdeapplication.h> diff --git a/tdeui/kxmlguifactory.cpp b/tdeui/kxmlguifactory.cpp index 8e9b376b2..07e5af78c 100644 --- a/tdeui/kxmlguifactory.cpp +++ b/tdeui/kxmlguifactory.cpp @@ -37,7 +37,7 @@ #include <kinstance.h> #include <tdeglobal.h> #include <tdeshortcut.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kkeydialog.h> using namespace KXMLGUI; diff --git a/tdeui/tdeabouttde.cpp b/tdeui/tdeabouttde.cpp index b29d482f3..4fa0e381f 100644 --- a/tdeui/tdeabouttde.cpp +++ b/tdeui/tdeabouttde.cpp @@ -23,7 +23,7 @@ #include <tdeabouttde.h> #include <tdeapplication.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> TDEAboutKDE::TDEAboutKDE( TQWidget *parent, const char *name, bool modal ) diff --git a/tdeui/tdeactionclasses.cpp b/tdeui/tdeactionclasses.cpp index eaa9f244a..b068477de 100644 --- a/tdeui/tdeactionclasses.cpp +++ b/tdeui/tdeactionclasses.cpp @@ -54,7 +54,7 @@ #include <tdetoolbar.h> #include <tdetoolbarbutton.h> #include <kurl.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstringhandler.h> class TDEToggleAction::TDEToggleActionPrivate diff --git a/tdeui/tdefontdialog.cpp b/tdeui/tdefontdialog.cpp index 2b657a7a8..b903a3a90 100644 --- a/tdeui/tdefontdialog.cpp +++ b/tdeui/tdefontdialog.cpp @@ -51,7 +51,7 @@ #include <tqlineedit.h> #include <tdelistbox.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <knuminput.h> diff --git a/tdeui/tdemainwindow.cpp b/tdeui/tdemainwindow.cpp index 33eb53676..a62633930 100644 --- a/tdeui/tdemainwindow.cpp +++ b/tdeui/tdemainwindow.cpp @@ -47,7 +47,7 @@ #include <tdemainwindow.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstaticdeleter.h> #if defined TQ_WS_X11 #include <netwm.h> diff --git a/tdeui/tests/kpanelmenutest.cpp b/tdeui/tests/kpanelmenutest.cpp index c08c03a8c..0c4bff8a6 100644 --- a/tdeui/tests/kpanelmenutest.cpp +++ b/tdeui/tests/kpanelmenutest.cpp @@ -1,6 +1,6 @@ #include "kpanelmenutest.h" #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <dcopclient.h> TestWidget::TestWidget(TQWidget *parent, const char *name) diff --git a/tdeui/tests/kxmlguitest.cpp b/tdeui/tests/kxmlguitest.cpp index d32593094..10dbe0844 100644 --- a/tdeui/tests/kxmlguitest.cpp +++ b/tdeui/tests/kxmlguitest.cpp @@ -7,7 +7,7 @@ #include <tdeaction.h> #include <kdebug.h> #include <kstdaction.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqlineedit.h> #include <tqdir.h> diff --git a/tdeui/tests/tdetoolbarlabelactiontest.cpp b/tdeui/tests/tdetoolbarlabelactiontest.cpp index 7c6222a11..0e39a9f59 100644 --- a/tdeui/tests/tdetoolbarlabelactiontest.cpp +++ b/tdeui/tests/tdetoolbarlabelactiontest.cpp @@ -22,7 +22,7 @@ #include <tdemainwindow.h> #include <klineedit.h> #include <tdelistview.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdetoolbarlabelaction.h> #include <ksqueezedtextlabel.h> #include <kdebug.h> diff --git a/tdeunittest/runner.cpp b/tdeunittest/runner.cpp index c63b6ed6c..f7f1ef52f 100644 --- a/tdeunittest/runner.cpp +++ b/tdeunittest/runner.cpp @@ -36,7 +36,7 @@ using namespace std; #include <kdebug.h> #include <klibloader.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "runner.h" #include "tester.h" diff --git a/tdeutils/kplugininfo.cpp b/tdeutils/kplugininfo.cpp index 95a37ae53..9a5613745 100644 --- a/tdeutils/kplugininfo.cpp +++ b/tdeutils/kplugininfo.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <tdeconfigbase.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdesktopfile.h> #include <kservice.h> diff --git a/tdeutils/kpluginselector.cpp b/tdeutils/kpluginselector.cpp index af771bd8f..ac8caf25b 100644 --- a/tdeutils/kpluginselector.cpp +++ b/tdeutils/kpluginselector.cpp @@ -41,7 +41,7 @@ #include <kdialog.h> #include <tdeglobal.h> #include <tdeglobalsettings.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ktabctl.h> #include <tdecmoduleinfo.h> #include <tqvaluelist.h> diff --git a/tdeutils/ksettings/dialog.cpp b/tdeutils/ksettings/dialog.cpp index 609d8cb16..6aeccd3c8 100644 --- a/tdeutils/ksettings/dialog.cpp +++ b/tdeutils/ksettings/dialog.cpp @@ -29,7 +29,7 @@ #include "ksettings/dispatcher.h" #include "ksettings/componentsdialog.h" #include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <tqvbox.h> #include <tqlabel.h> diff --git a/tdeutils/tdecmoduleinfo.cpp b/tdeutils/tdecmoduleinfo.cpp index b94603601..91a1814d4 100644 --- a/tdeutils/tdecmoduleinfo.cpp +++ b/tdeutils/tdecmoduleinfo.cpp @@ -26,7 +26,7 @@ #include <kdesktopfile.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include "tdecmoduleinfo.h" diff --git a/tdeutils/tdecmoduleproxy.cpp b/tdeutils/tdecmoduleproxy.cpp index 85724a0a3..17ebd94b2 100644 --- a/tdeutils/tdecmoduleproxy.cpp +++ b/tdeutils/tdecmoduleproxy.cpp @@ -45,7 +45,7 @@ #include <tdelocale.h> #include <tdeprocess.h> #include <kservice.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kuser.h> #include <X11/Xlib.h> diff --git a/tdewallet/backend/tdewalletbackend.cpp b/tdewallet/backend/tdewalletbackend.cpp index 83e37a49a..978335e67 100644 --- a/tdewallet/backend/tdewalletbackend.cpp +++ b/tdewallet/backend/tdewalletbackend.cpp @@ -27,7 +27,7 @@ #include <tdelocale.h> #include <kmdcodec.h> #include <ksavefile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqfile.h> #include <tqfileinfo.h> diff --git a/tdewallet/tests/tdewalletasync.cpp b/tdewallet/tests/tdewalletasync.cpp index 54e618b70..09c91ac8c 100644 --- a/tdewallet/tests/tdewalletasync.cpp +++ b/tdewallet/tests/tdewalletasync.cpp @@ -6,7 +6,7 @@ #include <tdecmdlineargs.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <dcopclient.h> #include <tdewallet.h> diff --git a/tdewallet/tests/tdewalletboth.cpp b/tdewallet/tests/tdewalletboth.cpp index bdfc73f8f..692db372e 100644 --- a/tdewallet/tests/tdewalletboth.cpp +++ b/tdewallet/tests/tdewalletboth.cpp @@ -6,7 +6,7 @@ #include <tdecmdlineargs.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <dcopclient.h> #include <tdewallet.h> diff --git a/tdewallet/tests/tdewalletsync.cpp b/tdewallet/tests/tdewalletsync.cpp index 307a4e846..235730b57 100644 --- a/tdewallet/tests/tdewalletsync.cpp +++ b/tdewallet/tests/tdewalletsync.cpp @@ -6,7 +6,7 @@ #include <tdecmdlineargs.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <dcopclient.h> #include <tdewallet.h> diff --git a/tdewidgets/maketdewidgets.cpp b/tdewidgets/maketdewidgets.cpp index b46e6d669..ca3daf732 100644 --- a/tdewidgets/maketdewidgets.cpp +++ b/tdewidgets/maketdewidgets.cpp @@ -21,7 +21,7 @@ static const char classHeader[] = "/**\n" "*/\n" "#include <tqwidgetplugin.h>\n"; static const char classDef[] = "#ifndef EMBED_IMAGES\n" - "#include <kstandarddirs.h>\n" + "#include <tdestandarddirs.h>\n" "#endif\n" "\n" "class %PluginName : public TQWidgetPlugin\n" diff --git a/translations/desktop_files/all_languages.desktop/nl.po b/translations/desktop_files/all_languages.desktop/nl.po index e2402b4d9..af0223b92 100644 --- a/translations/desktop_files/all_languages.desktop/nl.po +++ b/translations/desktop_files/all_languages.desktop/nl.po @@ -1,40 +1,41 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Heimen Stoffels <[email protected]>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-11-25 17:36+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <[email protected]>\n" +"PO-Revision-Date: 2025-02-08 11:12+0000\n" +"Last-Translator: Heimen Stoffels <[email protected]>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdelibs/all-languages/nl/>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: all_languages.desktop:2 msgid "Afar" -msgstr "" +msgstr "Afar" #. Name #: all_languages.desktop:4 msgid "Abkhazian" -msgstr "" +msgstr "Abchazisch" #. Name #: all_languages.desktop:6 msgid "Avestan" -msgstr "" +msgstr "Avestisch" #. Name #: all_languages.desktop:8 msgid "Afrikaans" -msgstr "" +msgstr "Afrikaans" #. Name #: all_languages.desktop:10 @@ -54,7 +55,7 @@ msgstr "Assamees" #. Name #: all_languages.desktop:16 msgid "Aymara" -msgstr "" +msgstr "Aymara" #. Name #: all_languages.desktop:18 @@ -64,12 +65,12 @@ msgstr "Azerbeidjaans" #. Name #: all_languages.desktop:20 msgid "Bashkir" -msgstr "" +msgstr "Bashkir" #. Name #: all_languages.desktop:22 msgid "Belarusian" -msgstr "Wit-Rusland" +msgstr "Belarussisch (Wit-Russisch)" #. Name #: all_languages.desktop:24 @@ -78,19 +79,18 @@ msgstr "Bulgaars" #. Name #: all_languages.desktop:26 -#, fuzzy msgid "Bihari" -msgstr "Amharisch" +msgstr "Bihari" #. Name #: all_languages.desktop:28 msgid "Bislama" -msgstr "" +msgstr "Bislama" #. Name #: all_languages.desktop:30 msgid "Bengali" -msgstr "" +msgstr "Bengaals" #. Name #: all_languages.desktop:32 @@ -100,7 +100,7 @@ msgstr "Tibetaans" #. Name #: all_languages.desktop:34 msgid "Breton" -msgstr "Bretoens" +msgstr "Bretons" #. Name #: all_languages.desktop:36 @@ -115,12 +115,12 @@ msgstr "Catalaans" #. Name #: all_languages.desktop:40 msgid "Chechen" -msgstr "" +msgstr "Tsjetsjeens" #. Name #: all_languages.desktop:42 msgid "Chamorro" -msgstr "" +msgstr "Chamorro" #. Name #: all_languages.desktop:44 @@ -135,22 +135,22 @@ msgstr "Tsjechisch" #. Name #: all_languages.desktop:48 msgid "Kashubian" -msgstr "" +msgstr "Kasjoebisch" #. Name #: all_languages.desktop:50 msgid "Church Slavic" -msgstr "Kerk Slavisch" +msgstr "Kerkslavisch" #. Name #: all_languages.desktop:52 msgid "Chuvash" -msgstr "" +msgstr "Tsjoevasjisch" #. Name #: all_languages.desktop:54 msgid "Welsh" -msgstr "" +msgstr "Welsh" #. Name #: all_languages.desktop:56 @@ -165,7 +165,7 @@ msgstr "Duits" #. Name #: all_languages.desktop:60 msgid "Dzongkha" -msgstr "" +msgstr "Dzongkha" #. Name #: all_languages.desktop:62 @@ -190,7 +190,7 @@ msgstr "Engels (Amerikaans)" #. Name #: all_languages.desktop:70 msgid "Esperanto" -msgstr "" +msgstr "Esperanto" #. Name #: all_languages.desktop:72 @@ -200,7 +200,7 @@ msgstr "Spaans" #. Name #: all_languages.desktop:74 msgid "Spanish (Argentina)" -msgstr "" +msgstr "Spaans (Argentinië)" #. Name #: all_languages.desktop:76 @@ -230,7 +230,7 @@ msgstr "Fijisch" #. Name #: all_languages.desktop:86 msgid "Faroese" -msgstr "" +msgstr "Faeröers" #. Name #: all_languages.desktop:88 @@ -240,18 +240,17 @@ msgstr "Frans" #. Name #: all_languages.desktop:90 msgid "Frisian" -msgstr "Frysk" +msgstr "Fries" #. Name #: all_languages.desktop:92 msgid "Irish" -msgstr "Gaelic (Iers)" +msgstr "Iers" #. Name #: all_languages.desktop:94 -#, fuzzy msgid "Gaelic" -msgstr "Gaelic (Iers)" +msgstr "Gaelisch" #. Name #: all_languages.desktop:96 @@ -261,22 +260,22 @@ msgstr "Galicisch" #. Name #: all_languages.desktop:98 msgid "Guarani" -msgstr "" +msgstr "Guarani" #. Name #: all_languages.desktop:100 msgid "Gujarati" -msgstr "" +msgstr "Gujarati" #. Name #: all_languages.desktop:102 msgid "Manx" -msgstr "" +msgstr "Manx-Gaelisch" #. Name #: all_languages.desktop:104 msgid "Hausa" -msgstr "" +msgstr "Hausa" #. Name #: all_languages.desktop:106 @@ -286,12 +285,12 @@ msgstr "Hebreeuws" #. Name #: all_languages.desktop:108 msgid "Hindi" -msgstr "" +msgstr "Hindi" #. Name #: all_languages.desktop:110 msgid "Hiri Motu" -msgstr "" +msgstr "Hiri Motu" #. Name #: all_languages.desktop:112 @@ -301,7 +300,7 @@ msgstr "Kroatisch" #. Name #: all_languages.desktop:114 msgid "Upper Sorbian" -msgstr "Opper Sorbian" +msgstr "Oppersorbisch" #. Name #: all_languages.desktop:116 @@ -316,12 +315,12 @@ msgstr "Armeens" #. Name #: all_languages.desktop:120 msgid "Herero" -msgstr "" +msgstr "Herero" #. Name #: all_languages.desktop:122 msgid "Interlingua" -msgstr "" +msgstr "Interlingua" #. Name #: all_languages.desktop:124 @@ -331,17 +330,17 @@ msgstr "Indonesisch" #. Name #: all_languages.desktop:126 msgid "Interlingue" -msgstr "" +msgstr "Interlingue" #. Name #: all_languages.desktop:128 msgid "Inupiaq" -msgstr "" +msgstr "Inupiaq" #. Name #: all_languages.desktop:130 msgid "Ido" -msgstr "" +msgstr "Ido" #. Name #: all_languages.desktop:132 @@ -356,7 +355,7 @@ msgstr "Italiaans" #. Name #: all_languages.desktop:136 msgid "Inuktitut" -msgstr "" +msgstr "Inuktitut" #. Name #: all_languages.desktop:138 @@ -376,27 +375,27 @@ msgstr "Georgisch" #. Name #: all_languages.desktop:144 msgid "Kikuyu" -msgstr "" +msgstr "Kikuyu" #. Name #: all_languages.desktop:146 msgid "Kazakh" -msgstr "" +msgstr "Kazachs" #. Name #: all_languages.desktop:148 msgid "Kalaallisut" -msgstr "" +msgstr "Kalaallisut" #. Name #: all_languages.desktop:150 msgid "Khmer" -msgstr "" +msgstr "Khmer" #. Name #: all_languages.desktop:152 msgid "Kannada" -msgstr "" +msgstr "Kannada" #. Name #: all_languages.desktop:154 @@ -406,7 +405,7 @@ msgstr "Koreaans" #. Name #: all_languages.desktop:156 msgid "Kashmiri" -msgstr "" +msgstr "Kashmiri" #. Name #: all_languages.desktop:158 @@ -416,18 +415,17 @@ msgstr "Koerdisch" #. Name #: all_languages.desktop:160 msgid "Komi" -msgstr "" +msgstr "Komi" #. Name #: all_languages.desktop:162 -#, fuzzy msgid "Cornish" -msgstr "Deens" +msgstr "Cornish" #. Name #: all_languages.desktop:164 msgid "Kirghiz" -msgstr "Kirghizisch" +msgstr "Kirgizisch" #. Name #: all_languages.desktop:166 @@ -437,7 +435,7 @@ msgstr "Latijn" #. Name #: all_languages.desktop:168 msgid "Luxembourgish" -msgstr "Letzenburgs" +msgstr "Luxemburgs" #. Name #: all_languages.desktop:170 @@ -447,12 +445,12 @@ msgstr "Limburgs" #. Name #: all_languages.desktop:172 msgid "Lingala" -msgstr "" +msgstr "Lingala" #. Name #: all_languages.desktop:174 msgid "Lao" -msgstr "" +msgstr "Lao" #. Name #: all_languages.desktop:176 @@ -467,7 +465,7 @@ msgstr "Lets" #. Name #: all_languages.desktop:180 msgid "Malagasy" -msgstr "" +msgstr "Malagassisch" #. Name #: all_languages.desktop:182 @@ -477,7 +475,7 @@ msgstr "Marshallees" #. Name #: all_languages.desktop:184 msgid "Maori" -msgstr "" +msgstr "Maori" #. Name #: all_languages.desktop:186 @@ -487,12 +485,12 @@ msgstr "Macedonisch" #. Name #: all_languages.desktop:188 msgid "Malayalam" -msgstr "" +msgstr "Malayalam" #. Name #: all_languages.desktop:190 msgid "Mongolian" -msgstr "Mongolisch" +msgstr "Mongools" #. Name #: all_languages.desktop:192 @@ -502,12 +500,12 @@ msgstr "Moldavisch" #. Name #: all_languages.desktop:194 msgid "Marathi" -msgstr "" +msgstr "Marathi" #. Name #: all_languages.desktop:196 msgid "Malay" -msgstr "" +msgstr "Malay" #. Name #: all_languages.desktop:198 @@ -522,17 +520,17 @@ msgstr "Burmees" #. Name #: all_languages.desktop:202 msgid "Nauru" -msgstr "" +msgstr "Nauru" #. Name #: all_languages.desktop:204 msgid "Norwegian Bokmål" -msgstr "Noors Bokmål" +msgstr "Noors (Bokmål)" #. Name #: all_languages.desktop:206 msgid "Ndebele, North" -msgstr "Ndebele, Noord" +msgstr "Noord-Ndebele" #. Name #: all_languages.desktop:208 @@ -547,7 +545,7 @@ msgstr "Nepalees" #. Name #: all_languages.desktop:212 msgid "Ndonga" -msgstr "" +msgstr "Ndonga" #. Name #: all_languages.desktop:214 @@ -557,12 +555,12 @@ msgstr "Nederlands" #. Name #: all_languages.desktop:216 msgid "Norwegian Nynorsk" -msgstr "Noors, Nynorsk" +msgstr "Noors (Nynorsk)" #. Name #: all_languages.desktop:218 msgid "Ndebele, South" -msgstr "Ndebele, Zuid" +msgstr "Zuid-Ndebele" #. Name #: all_languages.desktop:220 @@ -572,27 +570,27 @@ msgstr "Noord-Sotho" #. Name #: all_languages.desktop:222 msgid "Navajo" -msgstr "" +msgstr "Navajo" #. Name #: all_languages.desktop:224 msgid "Chichewa" -msgstr "" +msgstr "Chichewa" #. Name #: all_languages.desktop:226 msgid "Occitan" -msgstr "" +msgstr "Occitaans" #. Name #: all_languages.desktop:228 msgid "Oromo" -msgstr "" +msgstr "Oromo" #. Name #: all_languages.desktop:230 msgid "Oriya" -msgstr "" +msgstr "Oriya" #. Name #: all_languages.desktop:232 @@ -602,12 +600,12 @@ msgstr "Ossetisch" #. Name #: all_languages.desktop:234 msgid "Punjabi" -msgstr "" +msgstr "Punjabi" #. Name #: all_languages.desktop:236 msgid "Pali" -msgstr "" +msgstr "Pali" #. Name #: all_languages.desktop:238 @@ -617,7 +615,7 @@ msgstr "Pools" #. Name #: all_languages.desktop:240 msgid "Pushto" -msgstr "" +msgstr "Pushto" #. Name #: all_languages.desktop:242 @@ -627,17 +625,17 @@ msgstr "Portugees" #. Name #: all_languages.desktop:244 msgid "Portuguese (Brazil)" -msgstr "Braziliaans Portugees" +msgstr "Portugees (Brazilië)" #. Name #: all_languages.desktop:246 msgid "Quechua" -msgstr "" +msgstr "Quechua" #. Name #: all_languages.desktop:248 msgid "Rundi" -msgstr "" +msgstr "Rundi" #. Name #: all_languages.desktop:250 @@ -657,12 +655,12 @@ msgstr "Russisch" #. Name #: all_languages.desktop:256 msgid "Kinyarwanda" -msgstr "" +msgstr "Kinyarwanda" #. Name #: all_languages.desktop:258 msgid "Sanskrit" -msgstr "" +msgstr "Sanskriet" #. Name #: all_languages.desktop:260 @@ -672,17 +670,17 @@ msgstr "Sardinisch" #. Name #: all_languages.desktop:262 msgid "Sindhi" -msgstr "" +msgstr "Sindhi" #. Name #: all_languages.desktop:264 msgid "Northern Sami" -msgstr "Noord Sami" +msgstr "Noord-Sami" #. Name #: all_languages.desktop:266 msgid "Sango" -msgstr "" +msgstr "Sango" #. Name #: all_languages.desktop:268 @@ -707,7 +705,7 @@ msgstr "Samoaans" #. Name #: all_languages.desktop:276 msgid "Shona" -msgstr "" +msgstr "Shona" #. Name #: all_languages.desktop:278 @@ -717,7 +715,7 @@ msgstr "Somalisch" #. Name #: all_languages.desktop:280 msgid "Albanian" -msgstr "Albanisch" +msgstr "Albanees" #. Name #: all_languages.desktop:282 @@ -727,22 +725,22 @@ msgstr "Servisch" #. Name #: all_languages.desktop:284 msgid "Serbian Latin" -msgstr "Servisch Latijn" +msgstr "Servisch (Latijn)" #. Name #: all_languages.desktop:286 msgid "Swati" -msgstr "" +msgstr "Swati" #. Name #: all_languages.desktop:288 msgid "Sotho, Southern" -msgstr "Sotho, Zuid" +msgstr "Zuid-Sotho" #. Name #: all_languages.desktop:290 msgid "Sundanese" -msgstr "Sundanees" +msgstr "Sudanees" #. Name #: all_languages.desktop:292 @@ -752,32 +750,32 @@ msgstr "Zweeds" #. Name #: all_languages.desktop:294 msgid "Swahili" -msgstr "" +msgstr "Swahili" #. Name #: all_languages.desktop:296 msgid "Tamil" -msgstr "" +msgstr "Tamil" #. Name #: all_languages.desktop:298 msgid "Telugu" -msgstr "" +msgstr "Telugu" #. Name #: all_languages.desktop:300 msgid "Tajik" -msgstr "Tajiks" +msgstr "Tadjieks" #. Name #: all_languages.desktop:302 msgid "Thai" -msgstr "Thais" +msgstr "Thai" #. Name #: all_languages.desktop:304 msgid "Tigrinya" -msgstr "" +msgstr "Tigrinya" #. Name #: all_languages.desktop:306 @@ -787,12 +785,12 @@ msgstr "Turkmeens" #. Name #: all_languages.desktop:308 msgid "Tswana" -msgstr "" +msgstr "Tswana" #. Name #: all_languages.desktop:310 msgid "Tonga" -msgstr "" +msgstr "Tonga" #. Name #: all_languages.desktop:312 @@ -802,17 +800,17 @@ msgstr "Turks" #. Name #: all_languages.desktop:314 msgid "Tsonga" -msgstr "" +msgstr "Tsonga" #. Name #: all_languages.desktop:316 msgid "Tatar" -msgstr "" +msgstr "Tataars" #. Name #: all_languages.desktop:318 msgid "Twi" -msgstr "" +msgstr "Twi" #. Name #: all_languages.desktop:320 @@ -822,32 +820,32 @@ msgstr "Tahitiaans" #. Name #: all_languages.desktop:322 msgid "Uighur" -msgstr "" +msgstr "Oeigoers" #. Name #: all_languages.desktop:324 msgid "Ukrainian" -msgstr "Oekraïns" +msgstr "Oekraïens" #. Name #: all_languages.desktop:326 msgid "Urdu" -msgstr "" +msgstr "Urdu" #. Name #: all_languages.desktop:328 msgid "Uzbek" -msgstr "Uzbeeks" +msgstr "Oezbeeks" #. Name #: all_languages.desktop:330 msgid "Uzbek (Cyrillic)" -msgstr "" +msgstr "Oezbeeks (Cyrillisch)" #. Name #: all_languages.desktop:332 msgid "Venda" -msgstr "" +msgstr "Venda" #. Name #: all_languages.desktop:334 @@ -867,27 +865,27 @@ msgstr "Waals" #. Name #: all_languages.desktop:340 msgid "Wolof" -msgstr "" +msgstr "Wolof" #. Name #: all_languages.desktop:342 msgid "Xhosa" -msgstr "" +msgstr "Xhosa" #. Name #: all_languages.desktop:344 msgid "Yiddish" -msgstr "" +msgstr "Jiddisch" #. Name #: all_languages.desktop:346 msgid "Yoruba" -msgstr "" +msgstr "Yoruba" #. Name #: all_languages.desktop:348 msgid "Zhuang" -msgstr "" +msgstr "Zhuang" #. Name #: all_languages.desktop:350 @@ -902,7 +900,7 @@ msgstr "Chinees (Vereenvoudigd)" #. Name #: all_languages.desktop:354 msgid "Chinese (Hong Kong)" -msgstr "Chinees (Hong Kong)" +msgstr "Chinees (Hongkong)" #. Name #: all_languages.desktop:356 @@ -912,4 +910,4 @@ msgstr "Chinees (Traditioneel)" #. Name #: all_languages.desktop:358 msgid "Zulu" -msgstr "" +msgstr "Zulu" diff --git a/translations/desktop_files/kate-desktops/es_AR.po b/translations/desktop_files/kate-desktops/es_AR.po index a53fc84c2..0c6b47791 100644 --- a/translations/desktop_files/kate-desktops/es_AR.po +++ b/translations/desktop_files/kate-desktops/es_AR.po @@ -1,80 +1,99 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. # Slávek Banko <[email protected]>, 2024. +# Alejo Fernández <[email protected]>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-02 14:39+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" +"PO-Revision-Date: 2025-03-08 21:44+0000\n" +"Last-Translator: Alejo Fernández <[email protected]>\n" +"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/" +"weblate/projects/tdelibs/kate-desktop-files/es_AR/>\n" "Language: es_AR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: data/katepart.desktop:2 +#, fuzzy msgid "Embedded Advanced Text Editor" -msgstr "" +msgstr "Editor de texto avanzado empotrable" #. Name #: plugins/autobookmarker/tdetexteditor_autobookmarker.desktop:2 +#, fuzzy msgid "KTextEditor Autobookmarker" -msgstr "" +msgstr "Automarcadores de KTextEditor" #. Comment #: plugins/autobookmarker/tdetexteditor_autobookmarker.desktop:3 +#, fuzzy msgid "Set bookmarks on lines matching a pattern when documents are loaded" msgstr "" +"Pone marcadores en las líneas que coinciden con un patrón definido al cargar " +"documentos." #. Name #: plugins/insertfile/tdetexteditor_insertfile.desktop:2 +#, fuzzy msgid "KTextEditor Insert File Plugin" -msgstr "" +msgstr "Plugin de inserción de archivos de KTextEditor" #. Comment #: plugins/insertfile/tdetexteditor_insertfile.desktop:3 +#, fuzzy msgid "Insert any readable file at cursor position" -msgstr "" +msgstr "Insertar cualquier archivo legible en la posición del cursor" #. Name #: plugins/isearch/tdetexteditor_isearch.desktop:2 +#, fuzzy msgid "KTextEditor Incremental Search Plugin" -msgstr "" +msgstr "Plugin de búsqueda incremental de KTextEditor" #. Comment #: plugins/isearch/tdetexteditor_isearch.desktop:3 msgid "Also known as \"As you type search\"" -msgstr "" +msgstr "También conocido como \"Búsqueda mientras tecleás\"" #. Name #: plugins/kdatatool/tdetexteditor_kdatatool.desktop:2 +#, fuzzy msgid "KTextEditor KDataTool Plugin" -msgstr "" +msgstr "Plugin KDataTool de KTextEditor" #. Comment #: plugins/kdatatool/tdetexteditor_kdatatool.desktop:3 msgid "Enable data tools like thesaurus and spell check (if installed)" msgstr "" +"Activa herramientas como el thesaurus y el corrector ortográfico (si están " +"instalados)" #. Name #: plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop:2 +#, fuzzy msgid "KTextEditor Word Completion Plugin" -msgstr "" +msgstr "Plugin de completado de palabras de KTextEditor" #. Comment #: plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop:3 +#, fuzzy msgid "Directional or popup-based completion from words in the document" -msgstr "" +msgstr "Completado de palabras direccional o de menú emergente en el documento." #. Name #: scripts/jstest.desktop:2 +#, fuzzy msgid "Kate Part JavaScript Test" -msgstr "" +msgstr "Prueba JavaScript de Kate Part" #. Comment #: scripts/jstest.desktop:3 +#, fuzzy msgid "Script for testing kate part's scripting" -msgstr "" +msgstr "Guión para probar el part de scripting de kate" diff --git a/translations/desktop_files/kate-desktops/nl.po b/translations/desktop_files/kate-desktops/nl.po index 2ee5a14c3..554b76369 100644 --- a/translations/desktop_files/kate-desktops/nl.po +++ b/translations/desktop_files/kate-desktops/nl.po @@ -1,42 +1,43 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Heimen Stoffels <[email protected]>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-02 14:39+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <[email protected]>\n" +"PO-Revision-Date: 2025-02-25 10:41+0000\n" +"Last-Translator: Heimen Stoffels <[email protected]>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdelibs/kate-desktop-files/nl/>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: data/katepart.desktop:2 msgid "Embedded Advanced Text Editor" -msgstr "Ingebed tekstinvoercomponent" +msgstr "Ingesloten tekstinvoeronderdeel" #. Name #: plugins/autobookmarker/tdetexteditor_autobookmarker.desktop:2 msgid "KTextEditor Autobookmarker" -msgstr "KTextEditor Autobladwijzers" +msgstr "KTextEditor - automatische bladwijzers" #. Comment #: plugins/autobookmarker/tdetexteditor_autobookmarker.desktop:3 msgid "Set bookmarks on lines matching a pattern when documents are loaded" msgstr "" -"Plaatsen van bladwijzers op regels die voldoen aan een bepaald patroon zodra " -"het document geopend wordt" +"Plaats bladwijzers op regels die voldoen aan een bepaald patroon zodra het " +"document geopend wordt" #. Name #: plugins/insertfile/tdetexteditor_insertfile.desktop:2 msgid "KTextEditor Insert File Plugin" -msgstr "KTextEditor-plugin voor het invoegen van bestanden" +msgstr "KTextEditor-plug-in voor het invoegen van bestanden" #. Comment #: plugins/insertfile/tdetexteditor_insertfile.desktop:3 @@ -46,29 +47,29 @@ msgstr "Voeg een willekeurig leesbaar bestand in op de cursorpositie" #. Name #: plugins/isearch/tdetexteditor_isearch.desktop:2 msgid "KTextEditor Incremental Search Plugin" -msgstr "KTextEditor-plugin voor incrementele zoekacties" +msgstr "KTextEditor-plug-in voor incrementele zoekacties" #. Comment #: plugins/isearch/tdetexteditor_isearch.desktop:3 msgid "Also known as \"As you type search\"" -msgstr "Ook bekend als \"Zoeken terwijl u typt\"" +msgstr "Ook bekend als ‘zoeken terwijl u typt’" #. Name #: plugins/kdatatool/tdetexteditor_kdatatool.desktop:2 msgid "KTextEditor KDataTool Plugin" -msgstr "KTextEditor-plugin voor KDatatool" +msgstr "KTextEditor-plug-in voor KDatatool" #. Comment #: plugins/kdatatool/tdetexteditor_kdatatool.desktop:3 msgid "Enable data tools like thesaurus and spell check (if installed)" msgstr "" -"Activering van hulpprogramma's, zoals de thesaurus en spellingcontrole " -"(indien geïnstalleerd)" +"Schakel hulpprogramma's in, zoals woordenboek en spellingcontrole (indien " +"geïnstalleerd)" #. Name #: plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop:2 msgid "KTextEditor Word Completion Plugin" -msgstr "KTextEditor-plugin voor het aanvullen van woorden" +msgstr "KTextEditor-plug-in voor het aanvullen van woorden" #. Comment #: plugins/wordcompletion/tdetexteditor_docwordcompletion.desktop:3 diff --git a/translations/desktop_files/mimetypes/nl.po b/translations/desktop_files/mimetypes/nl.po index 7bcad113e..13cb38cfd 100644 --- a/translations/desktop_files/mimetypes/nl.po +++ b/translations/desktop_files/mimetypes/nl.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Heimen Stoffels <[email protected]>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-05-26 20:48+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <[email protected]>\n" +"PO-Revision-Date: 2025-02-25 10:41+0000\n" +"Last-Translator: Heimen Stoffels <[email protected]>\n" +"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/" +"tdelibs/mimetypes/nl/>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Comment #: all.desktop:4 @@ -29,7 +30,7 @@ msgstr "Alle bestanden" #. Comment #: application/chm.desktop:2 msgid "HTML Help Document" -msgstr "HTML Help-document" +msgstr "Html-hulpdocument" #. Comment #: application/fits.desktop:4 @@ -44,7 +45,7 @@ msgstr "Adobe Illustrator-document" #. Comment #: application/java.desktop:5 application/x-java.desktop:6 msgid "Java Class" -msgstr "Java-klasse" +msgstr "Javaklasse" #. Comment #: application/mathml+xml.desktop:8 @@ -60,7 +61,7 @@ msgstr "MBOX-postvakmap" #: application/msexcel.desktop:7 application/vnd.ms-excel.desktop:6 #: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.desktop:6 msgid "Microsoft Excel Spreadsheet" -msgstr "Microsoft Excel-spreadsheet" +msgstr "Microsoft Excel-rekenblad" #. Comment #: application/mspowerpoint.desktop:7 application/vnd.ms-powerpoint.desktop:6 @@ -87,12 +88,12 @@ msgstr "Ogg-multimedia" #. Comment #: application/pdf.desktop:7 msgid "PDF Document" -msgstr "PDF-document" +msgstr "Pdf-document" #. Comment #: application/pgp-encrypted.desktop:6 msgid "PGP/MIME Encrypted Message Header" -msgstr "PGP/MIME-versleuteld berichthoofd" +msgstr "Pgp-/Mime-versleutelde berichtkop" #. Comment #: application/pgp-keys.desktop:6 @@ -107,7 +108,7 @@ msgstr "Losgekoppelde OpenPGP-signatuur" #. Comment #: application/pgp.desktop:5 msgid "PGP Encrypted or Signed Message" -msgstr "PGP-versleuteld of -ondertekend bericht" +msgstr "Pgp-versleuteld of -ondertekend bericht" #. Comment #: application/pkcs10.desktop:6 @@ -132,7 +133,7 @@ msgstr "PostScript-document" #. Comment #: application/relaxng.desktop:2 msgid "RELAX NG" -msgstr "" +msgstr "RELAX NG" #. Comment #: application/sieve.desktop:5 @@ -147,7 +148,7 @@ msgstr "Synchronized Multimedia Integration Language (SMIL)" #. Comment #: application/vnd.gentoo.ebuild.desktop:3 msgid "Gentoo ebuild file" -msgstr "" +msgstr "Gentoo ebuild-bestand" #. Comment #: application/vnd.mozilla.xul+xml.desktop:7 @@ -157,7 +158,7 @@ msgstr "Mozilla XUL-bestand" #. Comment #: application/vnd.ms-access.desktop:5 application/x-msaccess.desktop:6 msgid "Microsoft Access Database" -msgstr "Microsoft Access-database" +msgstr "Microsoft Access-databank" #. Comment #: application/vnd.ms-asf.desktop:5 video/x-ms-asf.desktop:7 @@ -167,149 +168,148 @@ msgstr "ASF-media" #. Comment #: application/vnd.ms-excel.addin.macroEnabled.12.desktop:6 msgid "Microsoft Excel Spreadsheet Add-In Macro Enabled" -msgstr "Microsoft Excel-spreadsheet" +msgstr "Microsoft Excel-werkblad met uitbreidingen en macro's" #. Comment #: application/vnd.ms-excel.sheet.binary.macroEnabled.12.desktop:6 #: application/vnd.ms-excel.sheet.macroEnabled.12.desktop:6 msgid "Microsoft Excel Spreadsheet Macro Enabled" -msgstr "Microsoft Excel-spreadsheet" +msgstr "Microsoft Excel-werkblad met macro's" #. Comment #: application/vnd.ms-excel.template.macroEnabled.12.desktop:6 msgid "Microsoft Excel Spreadsheet Template Macro Enabled" -msgstr "Microsoft Excel-spreadsheet" +msgstr "Microsoft Excel-werkbladsjabloon met macro's" #. Comment #: application/vnd.ms-powerpoint.addin.macroEnabled.12.desktop:6 msgid "Microsoft PowerPoint Presentation Add-In Macro Enabled" -msgstr "Microsoft PowerPoint-presentatie" +msgstr "Microsoft PowerPoint-presentatie met uitbreidingen en macro's" #. Comment #: application/vnd.ms-powerpoint.presentation.macroEnabled.12.desktop:6 msgid "Microsoft PowerPoint Presentation Macro Enabled" -msgstr "Microsoft PowerPoint-presentatie" +msgstr "Microsoft PowerPoint-presentatie met macro's" #. Comment #: application/vnd.ms-powerpoint.slideshow.macroEnabled.12.desktop:6 msgid "Microsoft PowerPoint Presentation SlideShow Macro Enabled" -msgstr "Microsoft PowerPoint-presentatie" +msgstr "Microsoft PowerPoint-presentatiediavoorstelling met macro's" #. Comment #: application/vnd.ms-powerpoint.template.macroEnabled.12.desktop:6 msgid "Microsoft PowerPoint Presentation Template Macro Enabled" -msgstr "Microsoft PowerPoint-presentatie" +msgstr "Microsoft PowerPoint-presentatiesjabloon met macro's" #. Comment #: application/vnd.ms-word.document.macroEnabled.12.desktop:6 msgid "Microsoft Word Document Macro Enabled" -msgstr "Microsoft Word-document" +msgstr "Microsoft Word-document met macro's" #. Comment #: application/vnd.ms-word.template.macroEnabled.12.desktop:6 msgid "Microsoft Word Document Template Macro Enabled" -msgstr "Microsoft Word-document" +msgstr "Microsoft Word-documentsjabloon met macro's" #. Comment #: application/vnd.oasis.opendocument.chart.desktop:6 msgid "OASIS OpenDocument Chart" -msgstr "OASIS OpenDocument grafiek" +msgstr "OASIS OpenDocument-grafiek" #. Comment #: application/vnd.oasis.opendocument.database.desktop:6 -#, fuzzy msgid "OASIS OpenDocument Database" -msgstr "OASIS OpenDocument grafiek" +msgstr "OASIS OpenDocument-databank" #. Comment #: application/vnd.oasis.opendocument.formula.desktop:6 msgid "OASIS OpenDocument Formula" -msgstr "OASIS OpenDocument formule" +msgstr "OASIS OpenDocument-formule" #. Comment #: application/vnd.oasis.opendocument.graphics-flat-xml.desktop:6 msgid "OASIS OpenDocument Graphics (Flat XML)" -msgstr "OASIS OpenDocument illustraties (Flat XML)" +msgstr "OASIS OpenDocument-illustraties (platte xml)" #. Comment #: application/vnd.oasis.opendocument.graphics-template.desktop:6 msgid "OASIS OpenDocument Graphics Template" -msgstr "OASIS OpenDocument illustratiesjabloon" +msgstr "OASIS OpenDocument-illustratiesjabloon" #. Comment #: application/vnd.oasis.opendocument.graphics.desktop:6 msgid "OASIS OpenDocument Graphics" -msgstr "OASIS OpenDocument illustraties" +msgstr "OASIS OpenDocument-illustraties" #. Comment #: application/vnd.oasis.opendocument.image.desktop:6 msgid "OASIS OpenDocument Image" -msgstr "OASIS OpenDocument afbeelding" +msgstr "OASIS OpenDocument-afbeelding" #. Comment #: application/vnd.oasis.opendocument.presentation-flat-xml.desktop:6 msgid "OASIS OpenDocument Presentation (Flat XML)" -msgstr "OASIS OpenDocument presentatie (Flat XML)" +msgstr "OASIS OpenDocument-presentatie (platte xml)" #. Comment #: application/vnd.oasis.opendocument.presentation-template.desktop:6 msgid "OASIS OpenDocument Presentation Template" -msgstr "OASIS OpenDocument presentatiesjabloon" +msgstr "OASIS OpenDocument-presentatiesjabloon" #. Comment #: application/vnd.oasis.opendocument.presentation.desktop:6 msgid "OASIS OpenDocument Presentation" -msgstr "OASIS OpenDocument presentatie" +msgstr "OASIS OpenDocument-presentatie" #. Comment #: application/vnd.oasis.opendocument.spreadsheet-flat-xml.desktop:6 msgid "OASIS OpenDocument SpreadSheet (Flat XML)" -msgstr "OASIS OpenDocument werkblad (Flat XML)" +msgstr "OASIS OpenDocument-werkblad (platte xml)" #. Comment #: application/vnd.oasis.opendocument.spreadsheet-template.desktop:6 msgid "OASIS OpenDocument SpreadSheet Template" -msgstr "OASIS OpenDocument werkbladsjabloon" +msgstr "OASIS OpenDocument-werkbladsjabloon" #. Comment #: application/vnd.oasis.opendocument.spreadsheet.desktop:6 msgid "OASIS OpenDocument SpreadSheet" -msgstr "OASIS OpenDocument werkblad" +msgstr "OASIS OpenDocument-werkblad" #. Comment #: application/vnd.oasis.opendocument.text-flat-xml.desktop:6 msgid "OASIS OpenDocument Text (Flat XML)" -msgstr "OASIS OpenDocument tekst (Flat XML)" +msgstr "OASIS OpenDocument-tekst (platte xml)" #. Comment #: application/vnd.oasis.opendocument.text-template.desktop:6 msgid "OASIS OpenDocument Text Template" -msgstr "OpenOffice.org tekstsjabloon" +msgstr "OpenOffice.org-tekstsjabloon" #. Comment #: application/vnd.oasis.opendocument.text.desktop:6 msgid "OASIS OpenDocument Text" -msgstr "OASIS OpenDocument tekst" +msgstr "OASIS OpenDocument-tekst" #. Comment #: application/vnd.openxmlformats-officedocument.presentationml.slideshow.desktop:6 msgid "Microsoft PowerPoint Presentation SlideShow" -msgstr "Microsoft PowerPoint-presentatie" +msgstr "Microsoft PowerPoint-presentatiediavoorstelling" #. Comment #: application/vnd.openxmlformats-officedocument.presentationml.template.desktop:6 msgid "Microsoft PowerPoint Presentation Template" -msgstr "Microsoft PowerPoint-presentatie" +msgstr "Microsoft PowerPoint-presentatiesjabloon" #. Comment #: application/vnd.openxmlformats-officedocument.spreadsheetml.template.desktop:6 msgid "Microsoft Excel Spreadsheet Template" -msgstr "Microsoft Excel-spreadsheet" +msgstr "Microsoft Excel-werkbladsjabloon" #. Comment #: application/vnd.openxmlformats-officedocument.wordprocessingml.template.desktop:6 msgid "Microsoft Word Document Template" -msgstr "Microsoft Word-document" +msgstr "Microsoft Word-documentsjabloon" #. Comment #: application/vnd.palm.desktop:6 @@ -324,25 +324,22 @@ msgstr "RealMedia-bestand" #. Comment #: application/vnd.stardivision.calc.desktop:6 msgid "StarOffice Calc Spreadsheet" -msgstr "StarOffice Calc-spreadsheet" +msgstr "StarOffice Calc-werkblad" #. Comment #: application/vnd.stardivision.chart.desktop:6 -#, fuzzy msgid "StarOffice Chart" -msgstr "StarOffice Calc-spreadsheet" +msgstr "StarOffice-grafiek" #. Comment #: application/vnd.stardivision.draw.desktop:6 -#, fuzzy msgid "StarOffice Drawing" -msgstr "MS Office-tekening" +msgstr "StarOffice-tekening" #. Comment #: application/vnd.stardivision.impress.desktop:6 -#, fuzzy msgid "StarOffice Impress Presentation" -msgstr "StarOffice Calc-spreadsheet" +msgstr "StarOffice Impress-presentatie" #. Comment #: application/vnd.stardivision.math.desktop:6 @@ -362,55 +359,52 @@ msgstr "StarOffice Writer-document" #. Comment #: application/vnd.sun.xml.base.desktop:2 msgid "OpenOffice.org Database" -msgstr "OpenOffice.org-database" +msgstr "OpenOffice.org-databank" #. Comment #: application/vnd.sun.xml.calc.desktop:2 -#, fuzzy msgid "OpenOffice.org Spreadsheet" -msgstr "OpenOffice.org Spreadsheet-sjabloon" +msgstr "OpenOffice.org-werkblad" #. Comment #: application/vnd.sun.xml.calc.template.desktop:2 msgid "OpenOffice.org Spreadsheet Template" -msgstr "OpenOffice.org Spreadsheet-sjabloon" +msgstr "OpenOffice.org-werkbladsjabloon" #. Comment #: application/vnd.sun.xml.draw.desktop:2 -#, fuzzy msgid "OpenOffice.org Drawing" -msgstr "OpenOffice.org Drawing-sjabloon" +msgstr "OpenOffice.org-tekening" #. Comment #: application/vnd.sun.xml.draw.template.desktop:2 msgid "OpenOffice.org Drawing Template" -msgstr "OpenOffice.org Drawing-sjabloon" +msgstr "OpenOffice.org-tekensjabloon" #. Comment #: application/vnd.sun.xml.impress.desktop:2 -#, fuzzy msgid "OpenOffice.org Presentation" -msgstr "OpenOffice.org Presentation-sjabloon" +msgstr "OpenOffice.org-presentatie" #. Comment #: application/vnd.sun.xml.impress.template.desktop:2 msgid "OpenOffice.org Presentation Template" -msgstr "OpenOffice.org Presentation-sjabloon" +msgstr "OpenOffice.org-presentatiesjabloon" #. Comment #: application/vnd.sun.xml.writer.desktop:2 msgid "OpenOffice.org Text Document" -msgstr "OpenOffice.org Text-document" +msgstr "OpenOffice.org-tekstdocument" #. Comment #: application/vnd.sun.xml.writer.master.desktop:2 msgid "OpenOffice.org Master Text Document" -msgstr "OpenOffice.org Text-hoofddocument" +msgstr "OpenOffice.org-teksthoofddocument" #. Comment #: application/vnd.sun.xml.writer.template.desktop:2 msgid "OpenOffice.org Text Document Template" -msgstr "OpenOffice.org Text-sjabloon" +msgstr "OpenOffice.org-tekstsjabloon" #. Comment #: application/wordperfect.desktop:6 @@ -435,7 +429,7 @@ msgstr "ACE-archief" #. Comment #: application/x-afm.desktop:2 msgid "PostScript Font Metrics" -msgstr "PostScript Lettertype-afmetingen" +msgstr "PostScript-lettertypeafmetingen" #. Comment #: application/x-amipro.desktop:6 @@ -500,7 +494,7 @@ msgstr "Bzip2-bestand" #. Comment #: application/x-cda.desktop:3 msgid "CD Audio" -msgstr "CD-audio" +msgstr "Cd-audio" #. Comment #: application/x-compress.desktop:6 @@ -510,7 +504,7 @@ msgstr "UNIX-compressiebestand" #. Comment #: application/x-core.desktop:6 msgid "Program Crash Data" -msgstr "Gegevens over vastgelopen programma's" +msgstr "Crashgegevens van programma" #. Comment #: application/x-cpio.desktop:6 @@ -520,7 +514,7 @@ msgstr "CPIO-archief" #. Comment #: application/x-cue.desktop:6 msgid "CDRWIN Cue-Sheet" -msgstr "CDRWIN-cue-sheet" +msgstr "CDRWIN-cueblad" #. Comment #: application/x-dbase.desktop:6 @@ -530,7 +524,7 @@ msgstr "dBASE-document" #. Comment #: application/x-deb.desktop:6 application/x-debian-package.desktop:7 msgid "Debian Package" -msgstr "Debian-pakket" +msgstr "Debianpakket" #. Comment #: application/x-designer.desktop:2 @@ -540,7 +534,7 @@ msgstr "TQt/Qt Designer-bestand" #. Comment #: application/x-desktop.desktop:2 msgid "Desktop Config File" -msgstr "Configuratiegegevens" +msgstr "Desktopbestand" #. Comment #: application/x-dvi.desktop:2 @@ -595,12 +589,12 @@ msgstr "Speedo-lettertype" #. Comment #: application/x-font-ttc.desktop:2 msgid "TrueType Font Collection" -msgstr "True Type-lettertypeverzameling" +msgstr "TrueType-lettertypeverzameling" #. Comment #: application/x-font-ttf.desktop:2 msgid "TrueType Font" -msgstr "True Type-lettertype" +msgstr "TrueType-lettertype" #. Comment #: application/x-font-type1.desktop:6 @@ -610,12 +604,12 @@ msgstr "PostScript Type1-lettertype" #. Comment #: application/x-gettext.desktop:2 msgid "GNU Gettext Message Catalog" -msgstr "GNU Gettext meldingencatalogus" +msgstr "GNU Gettext-berichtcatalogus" #. Comment #: application/x-gnumeric.desktop:6 msgid "GNUmeric Spreadsheet" -msgstr "GNUmeric-spreadsheet" +msgstr "GNUmeric-werkblad" #. Comment #: application/x-graphite.desktop:7 @@ -659,19 +653,18 @@ msgstr "Java-archief" #. Comment #: application/x-java-applet.desktop:3 -#, fuzzy msgid "Java Applet" -msgstr "Java-archief" +msgstr "Java-applet" #. Comment #: application/x-java-jnlp-file.desktop:4 msgid "Java Web Start application" -msgstr "Java Web Start-toepassing" +msgstr "Java Web Start-programma" #. Comment #: application/x-javascript.desktop:6 text/javascript.desktop:5 msgid "JavaScript File" -msgstr "JavaScript-bestand" +msgstr "Javascriptbestand" #. Comment #: application/x-karbon.desktop:7 @@ -686,7 +679,7 @@ msgstr "KChart-document" #. Comment #: application/x-kcsrc.desktop:6 msgid "TDE Color Theme" -msgstr "TDE-kleurenthema" +msgstr "TDE-kleurenschema" #. Comment #: application/x-kformula.desktop:6 @@ -781,12 +774,12 @@ msgstr "Mime-ingekapseld webarchief" #. Comment #: application/x-mplayer2.desktop:8 msgid "Microsoft Media Format" -msgstr "Microsoft mediaformaat" +msgstr "Microsoft-mediaformaat" #. Comment #: application/x-msdos-program.desktop:2 msgid "Windows Executable" -msgstr "Windows-programma" +msgstr "Windowsprogramma" #. Comment #: application/x-mswrite.desktop:6 @@ -796,12 +789,12 @@ msgstr "Microsoft Write-document" #. Comment #: application/x-nzb.desktop:3 msgid "NewzBin Usenet Index" -msgstr "" +msgstr "NewzBin Usenet-index" #. Comment #: application/x-object.desktop:6 msgid "Object Code" -msgstr "Object-code" +msgstr "Objectcode" #. Comment #: application/x-pak.desktop:6 @@ -821,12 +814,12 @@ msgstr "Perl-programma" #. Comment #: application/x-php.desktop:2 msgid "PHP Script" -msgstr "PHP-script" +msgstr "Php-script" #. Comment #: application/x-pkcs12.desktop:6 msgid "PKCS#12 Certificate Bundle" -msgstr "PKCS#12 Certificatenbundel" +msgstr "PKCS#12-certificatenbundel" #. Comment #: application/x-pw.desktop:3 @@ -856,7 +849,7 @@ msgstr "Rar-archief" #. Comment #: application/x-rpm.desktop:7 msgid "RPM Package File" -msgstr "RPM-pakket" +msgstr "Rpm-pakket" #. Comment #: application/x-ruby.desktop:2 @@ -871,27 +864,27 @@ msgstr "Gedeelde bibliotheek" #. Comment #: application/x-shellscript.desktop:2 text/x-shellscript.desktop:2 msgid "Shell Script" -msgstr "Shell-script" +msgstr "Shellscript" #. Comment #: application/x-shockwave-flash.desktop:6 msgid "Shockwave Flash Media" -msgstr "" +msgstr "Shockwave Flash-media" #. Comment #: application/x-siag.desktop:3 msgid "Siag Spreadsheet" -msgstr "Siag-spreadsheet" +msgstr "Siag-werkblad" #. Comment #: application/x-sqlite2.desktop:6 msgid "SQLite2 Database File" -msgstr "SQLite2 databasebestand" +msgstr "SQLite2-databankbestand" #. Comment #: application/x-sqlite3.desktop:6 msgid "SQLite3 Database File" -msgstr "SQLite3 databasebestand" +msgstr "SQLite3-databankbestand" #. Comment #: application/x-tar.desktop:6 @@ -911,7 +904,7 @@ msgstr "Met Bzip2 ingepakt Tar-archief" #. Comment #: application/x-tde-wallet.desktop:4 msgid "TDE Wallet File" -msgstr "TDEWallet-portefeuillebestand" +msgstr "TDEWallet-bestand" #. Comment #: application/x-tex-gf.desktop:2 @@ -1011,7 +1004,7 @@ msgstr "Leeg document" #. Comment #: application/x-zip.desktop:6 msgid "Zip Archive" -msgstr "Zip-archief" +msgstr "Ziparchief" #. Comment #: application/x-zoo.desktop:6 @@ -1178,7 +1171,7 @@ msgstr "FITS-afbeelding" #. Name #: image/gif.desktop:6 ../kimgio/gif.kimgio:4 msgid "GIF Image" -msgstr "GIF-afbeelding" +msgstr "Gif-afbeelding" #. Comment #. Name @@ -1190,24 +1183,24 @@ msgstr "JPEG 2000-afbeelding" #. Name #: image/jpeg.desktop:6 image/pjpeg.desktop:7 ../kimgio/jpeg.kimgio:4 msgid "JPEG Image" -msgstr "JPEG-afbeelding" +msgstr "Jpeg-afbeelding" #. Comment #. Name #: image/png.desktop:6 ../kimgio/png.kimgio:4 msgid "PNG Image" -msgstr "PNG-afbeelding" +msgstr "Png-afbeelding" #. Comment #: image/svg+xml.desktop:7 msgid "Scalable Vector Graphics" -msgstr "Schaalbare Vector Afbeelding" +msgstr "Schaalbare Vector-afbeelding (svg)" #. Comment #. Name #: image/tiff.desktop:6 ../kimgio/tiff.kimgio:4 msgid "TIFF Image" -msgstr "TIFF-afbeelding" +msgstr "Tiff-afbeelding" #. Comment #. Name @@ -1219,7 +1212,7 @@ msgstr "WebP-afbeelding" #. Name #: image/x-bmp.desktop:6 ../kimgio/bmp.kimgio:4 msgid "BMP Image" -msgstr "BMP-afbeelding" +msgstr "Bmp-afbeelding" #. Comment #: image/x-dds.desktop:6 @@ -1257,7 +1250,7 @@ msgstr "MS Windows-pictogram" #. Comment #: image/x-jng.desktop:6 msgid "JNG Image" -msgstr "JNG-afbeelding" +msgstr "Jng-afbeelding" #. Comment #: image/x-msod.desktop:6 @@ -1302,7 +1295,7 @@ msgstr "RAW-camera-afbeelding" #. Name #: image/x-rgb.desktop:6 ../kimgio/rgb.kimgio:4 msgid "SGI Image (RGB)" -msgstr "SGI-Afbeelding (RGB)" +msgstr "SGI-afbeelding (RGB)" #. Comment #. Name @@ -1324,7 +1317,7 @@ msgstr "QPicture-metabestand" #. Comment #: image/x-wmf.desktop:6 msgid "Windows MetaFile" -msgstr "Windows Meta-bestand" +msgstr "Windows-metabestand" #. Comment #. Name @@ -1361,7 +1354,7 @@ msgstr "Blokapparaat" #. Comment #: inode/chardevice.desktop:2 msgid "Character Device" -msgstr "" +msgstr "Tekenapparaat" #. Comment #: inode/directory-locked.desktop:2 @@ -1381,7 +1374,7 @@ msgstr "Datastroom" #. Comment #: inode/socket.desktop:2 msgid "Socket" -msgstr "" +msgstr "Socket" #. Comment #: message/news.desktop:6 @@ -1416,7 +1409,7 @@ msgstr "iCalendar-bestand" #. Comment #: text/css.desktop:3 msgid "Cascading Style Sheet" -msgstr "Cascading Style Sheet (stijlbladen)" +msgstr "Cascading Style Sheet (stijlblad)" #. Comment #: text/docbook.desktop:2 @@ -1431,19 +1424,17 @@ msgstr "Licht opgemaakt tekstdocument" #. Comment #: text/html.desktop:2 msgid "HTML Document" -msgstr "HTML-document" +msgstr "Html-document" #. Comment #: text/markdown.desktop:2 -#, fuzzy -#| msgid "Karbon14 Document" msgid "Markdown document" -msgstr "Karbon14-document" +msgstr "Markdown-document" #. Comment #: text/plain.desktop:3 msgid "Plain Text Document" -msgstr "Platte tekst-document" +msgstr "Plattetekstdocument" #. Comment #: text/rdf.desktop:3 @@ -1453,12 +1444,12 @@ msgstr "Resource Description Framework-bestand" #. Comment #: text/rss.desktop:3 msgid "RDF Site Summary" -msgstr "RDF-site samenvatting" +msgstr "Rdf-site samenvatting" #. Comment #: text/rtf.desktop:3 msgid "RTF Document" -msgstr "RTF-document" +msgstr "Rtf-document" #. Comment #: text/sgml.desktop:3 @@ -1508,7 +1499,7 @@ msgstr "C-bronbestand" #. Comment #: text/x-csv.desktop:7 msgid "Text File with Comma Separated Values" -msgstr "Tekstbestand met door komma's gescheiden waarden" +msgstr "Tekstbestand met kommagescheiden waarden" #. Comment #: text/x-diff.desktop:3 @@ -1543,22 +1534,22 @@ msgstr "LDAP-adresboek" #. Comment #: text/x-log.desktop:3 msgid "Application Log File" -msgstr "Programmalogbestand" +msgstr "Programmalogboek" #. Comment #: text/x-makefile.desktop:3 msgid "Makefile" -msgstr "" +msgstr "Makefile" #. Comment #: text/x-moc.desktop:3 msgid "Qt Meta Object File" -msgstr "Qt-Meta-Object-bestand" +msgstr "Qt Meta-objectbestand" #. Comment #: text/x-mswinurl.desktop:6 msgid "Internet Shortcut" -msgstr "Internet snelkoppeling" +msgstr "Internetsnelkoppeling" #. Comment #: text/x-objchdr.desktop:2 diff --git a/translations/desktop_files/tdeprint-desktops/es_AR.po b/translations/desktop_files/tdeprint-desktops/es_AR.po index 38c4ad4b3..73820fdb4 100644 --- a/translations/desktop_files/tdeprint-desktops/es_AR.po +++ b/translations/desktop_files/tdeprint-desktops/es_AR.po @@ -1,63 +1,76 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. # Slávek Banko <[email protected]>, 2024. +# Alejo Fernández <[email protected]>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-04 16:37+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" +"PO-Revision-Date: 2025-03-07 20:44+0000\n" +"Last-Translator: Alejo Fernández <[email protected]>\n" +"Language-Team: Spanish (Argentina) <https://mirror.git.trinitydesktop.org/" +"weblate/projects/tdelibs/tdeprint-desktop-files/es_AR/>\n" "Language: es_AR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: filters/enscript.desktop:2 +#, fuzzy msgid "enscript" -msgstr "" +msgstr "enscript" #. Comment #: filters/enscript.desktop:4 +#, fuzzy msgid "Enscript Text Filter" -msgstr "" +msgstr "Filtro de textos Enscript" #. Name #: filters/imagetops.desktop:2 +#, fuzzy msgid "imagetops" -msgstr "" +msgstr "imagetops" #. Comment #: filters/imagetops.desktop:4 +#, fuzzy msgid "Generic Image to PS Filter" -msgstr "" +msgstr "Imagen genérica a filtro PS" #. Name #: filters/pdf2ps.desktop:2 +#, fuzzy msgid "pdf2ps" -msgstr "" +msgstr "pdf2ps" #. Comment #: filters/pdf2ps.desktop:4 +#, fuzzy msgid "PDF to PostScript Converter" -msgstr "" +msgstr "Conversor de PDF a PostScript" #. Name #: filters/pdfwrite.desktop:2 +#, fuzzy msgid "pdfwrite" -msgstr "" +msgstr "pdfwrite" #. Comment #: filters/pdfwrite.desktop:4 +#, fuzzy msgid "PDF Writer (needs Ghostscript)" -msgstr "" +msgstr "Escritor de PDF (requiere Ghostscript)" #. Comment #: filters/poster.desktop:3 +#, fuzzy msgid "Poster Printing" -msgstr "" +msgstr "Impresión de poster" #. Description #: filters/poster.desktop:4 @@ -68,193 +81,232 @@ msgid "" "a modified version of the original one that can be found on any CTAN archive " "mirror, but the original package will <b>not</b> work with TDE." msgstr "" +"Programa para imprimir posters grandes en varias hojas de papel. Para usar " +"ésta orden, el ejecutable <b>poster</b> debe estar accesible en tu " +"<tt>PATH</tt>.<p><b><u>¡Atención!</u></b> el paquete en el sitio web web " +"TDEPrint es una versión modificada de la original que se puede encontrar en " +"cualquier réplica de archivos de CTAN. Pero el paquete original <b>no</b> " +"funciona con TDE." #. Name #: filters/ps2pdf.desktop:2 +#, fuzzy msgid "ps2pdf" -msgstr "" +msgstr "ps2pdf" #. Comment #: filters/ps2pdf.desktop:4 +#, fuzzy msgid "PostScript to PDF Converter" -msgstr "" +msgstr "Conversor de PostScript a PDF" #. Name #: filters/psbook.desktop:2 +#, fuzzy msgid "psbook" -msgstr "" +msgstr "psbook" #. Comment #: filters/psbook.desktop:4 msgid "Pamphlet Printing (use with small side duplex printing)" -msgstr "" +msgstr "Impresión de panfleto (usar con impresión de doble cara pequeña)" #. Name #: filters/psbook1.desktop:2 +#, fuzzy msgid "psbook1" -msgstr "" +msgstr "psbook1" #. Comment #: filters/psbook1.desktop:4 msgid "Pamphlet Printing - Even Pages (step 1)" -msgstr "" +msgstr "Impresión de panfleto - páginas pares (paso 1)" #. Name #: filters/psbook2.desktop:2 +#, fuzzy msgid "psbook2" -msgstr "" +msgstr "psbook2" #. Comment #: filters/psbook2.desktop:4 msgid "Pamphlet Printing - Odd Pages (step 2)" -msgstr "" +msgstr "Impresión de panfleto - páginas impares (paso 2)" #. Name #: filters/psnup.desktop:2 +#, fuzzy msgid "psnup" -msgstr "" +msgstr "psnup" #. Comment #: filters/psnup.desktop:4 +#, fuzzy msgid "Multiple Pages per Sheet Filter" -msgstr "" +msgstr "Filtro para múltiples páginas por hoja" #. Name #: filters/psresize.desktop:2 +#, fuzzy msgid "psresize" -msgstr "" +msgstr "psresize" #. Comment #: filters/psresize.desktop:4 +#, fuzzy msgid "Scale Print Content to Fit on Another Paper Size" msgstr "" +"Escalar el contenido de la impresión para ajustar en otro tamaño del papel" #. Name #: filters/psselect.desktop:2 +#, fuzzy msgid "psselect" -msgstr "" +msgstr "psselect" #. Comment #: filters/psselect.desktop:4 +#, fuzzy msgid "Page Selection/Ordering Filter" -msgstr "" +msgstr "Filtro de ordenamiento/selección de página" #. Name #: specials.desktop:5 +#, fuzzy msgid "Print to File (PostScript)" -msgstr "" +msgstr "Imprimir en archivo (PostScript)" #. Description #: specials.desktop:6 +#, fuzzy msgid "Write PostScript file" -msgstr "" +msgstr "Escribir archivo PostScript" #. Comment #: specials.desktop:7 specials.desktop:17 +#, fuzzy msgid "Local file" -msgstr "" +msgstr "Archivo local" #. Name #: specials.desktop:15 +#, fuzzy msgid "Print to File (PDF)" -msgstr "" +msgstr "Imprimir en archivo (PDF)" #. Description #: specials.desktop:16 +#, fuzzy msgid "Write PDF/Acrobat file" -msgstr "" +msgstr "Escribir archivo PDF/Acrobat" #. Name #: specials.desktop:26 +#, fuzzy msgid "Send to Fax" -msgstr "" +msgstr "Enviar a fax" #. Description #: specials.desktop:27 +#, fuzzy msgid "Send to external fax system" -msgstr "" +msgstr "Enviar a sistema de fax externo" #. Comment #: specials.desktop:28 +#, fuzzy msgid "External" -msgstr "" +msgstr "Externo" #. Comment #: specials.desktop:37 +#, fuzzy msgid "Attachment for KMail Composer" -msgstr "" +msgstr "Adjunto para el editor de KMail" #. Description #: specials.desktop:38 +#, fuzzy msgid "Creates PDF/Acrobat file as attachment for KMail" -msgstr "" +msgstr "Crear archivo PDF/Acrobat como adjunto para KMail" #. Name #: specials.desktop:43 msgid "Mail PDF File" -msgstr "" +msgstr "Enviar archivo PDF por mail" #. Comment #: specials.desktop:48 +#, fuzzy msgid "KSendFax" -msgstr "" +msgstr "KSendFax" #. Description #: specials.desktop:49 msgid "Use ksendfax to fax the current document" -msgstr "" +msgstr "Usá ksendfax para enviar un fax del documento actual" #. Name #: specials.desktop:53 +#, fuzzy msgid "Advanced Faxing Tool (ksendfax)" -msgstr "" +msgstr "Herramienta avanzada de envío de faxes (ksendfax)" #. Name #: tdeprintd.desktop:11 +#, fuzzy msgid "TDE Print Daemon" -msgstr "" +msgstr "Demonio de impresión de TDE" #. Comment #: tdeprintd.desktop:12 +#, fuzzy msgid "Print daemon for TDE" -msgstr "" +msgstr "Demonio de impresión para TDE" #. Name #: tools/escputil/escputil.desktop:2 +#, fuzzy msgid "EPSON InkJet" -msgstr "" +msgstr "EPSON InkJet" #. Comment #: cups/cups.print:3 +#, fuzzy msgid "CUPS (Common UNIX Print System)" -msgstr "" +msgstr "CUPS (sistema de impresión común para Unix)" #. Comment #: ext/ext.print:3 +#, fuzzy msgid "Print Through an External Program (generic)" -msgstr "" +msgstr "Imprime a través de un programa externo (genérico)" #. Comment #: foomatic/foomatic.print:3 +#, fuzzy msgid "Foomatic (CUPS, LPRng, PDQ)" -msgstr "" +msgstr "Foomatic (CUPS, LPRng, PDQ)" #. Comment #: lpd/lpd.print:3 +#, fuzzy msgid "LPR (Standard BSD print system)" -msgstr "" +msgstr "LPR (sistema de impresión estándar de BSD)" #. Comment #: lpdunix/lpdunix.print:3 msgid "Generic UNIX LPD Print System (default)" -msgstr "" +msgstr "Sistema de impresión genérico LPD de Unix (por omisión)" #. Comment #: lpr/lpr.print:3 +#, fuzzy msgid "LPR/LPRng Print System" -msgstr "" +msgstr "Sistema de impresión LPR/LPRNg" #. Comment #: rlpr/rlpr.print:3 +#, fuzzy msgid "RLPR Environment (Remote LPD servers)" -msgstr "" +msgstr "Entorno RLPR (servidores LPD remotos)" diff --git a/win/pro_files/tdecore/tdecore.pro b/win/pro_files/tdecore/tdecore.pro index 28b353e85..5e9a8ce1d 100644 --- a/win/pro_files/tdecore/tdecore.pro +++ b/win/pro_files/tdecore/tdecore.pro @@ -45,7 +45,7 @@ kurldrag.cpp \ kurl.cpp \ kidna.cpp \ kstaticdeleter.cpp \ -kstandarddirs.cpp \ +tdestandarddirs.cpp \ tdeconfig.cpp \ tdeconfigdialogmanager.cpp \ kcharsets.cpp \ @@ -76,8 +76,8 @@ kiconloader.cpp \ kiconeffect.cpp \ tdeglobalsettings.cpp \ kckey.cpp \ -kglobalaccel.cpp \ -kglobalaccel_win.cpp \ +tdeglobalaccel.cpp \ +tdeglobalaccel_win.cpp \ tdeaccelaction.cpp \ tdeuniqueapplication.cpp \ tdesycoca.cpp \ |